From 03839b7cfe4a7811efa4ddb984210483ad26bd89 Mon Sep 17 00:00:00 2001
From: Alayan <alayan.feh@gmail.com>
Date: Sun, 16 Sep 2018 16:37:42 +0200
Subject: [PATCH] Move GUI files to categorized folders and update all
 references

---
 data/gui/{ => dialogs}/addons_loading.stkgui  |   8 ++--
 .../{ => dialogs}/android/init_android.stkgui |   4 +-
 .../android/multitouch_settings.stkgui        |   0
 data/gui/{ => dialogs}/confirm_dialog.stkgui  |   4 +-
 .../confirm_resolution_dialog.stkgui          |   0
 .../custom_video_settings.stkgui              |   0
 data/gui/{ => dialogs}/debug_slider.stkgui    |   0
 .../general_text_field_dialog.stkgui          |   0
 .../ghost_replay_info_dialog.stkgui           |   8 ++--
 .../{ => dialogs}/kart_color_slider.stkgui    |   0
 .../online/change_password.stkgui             |   4 +-
 .../online/notification_dialog.stkgui         |   4 +-
 .../online/player_rankings_dialog.stkgui      |   4 +-
 .../{ => dialogs}/online/recovery_info.stkgui |   2 +-
 .../online/recovery_input.stkgui              |   4 +-
 .../online/registration_terms.stkgui          |   4 +-
 .../online/server_info_dialog.stkgui          |   4 +-
 .../online/splitscreen_player_dialog.stkgui   |   8 ++--
 .../online/user_info_dialog.stkgui            |  12 +++---
 .../{ => dialogs}/online/vote_dialog.stkgui   |   2 +-
 .../gui/{ => dialogs}/overworld_dialog.stkgui |  10 ++---
 .../{ => dialogs}/press_a_key_dialog.stkgui   |   0
 .../{ => dialogs}/race_paused_dialog.stkgui   |  14 +++----
 .../gui/{ => dialogs}/select_challenge.stkgui |   8 ++--
 .../select_challenge_nobest.stkgui            |   6 +--
 .../tutorial_message_dialog.stkgui            |   0
 data/gui/{ => icons}/License.txt              |   0
 data/gui/{ => icons}/addons.png               | Bin
 .../{ => icons}/android/blur_bg_button.png    | Bin
 .../android/blur_bg_button_focus.png          | Bin
 data/gui/{ => icons}/android/drift.png        | Bin
 data/gui/{ => icons}/android/license.txt      |   0
 data/gui/{ => icons}/android/nitro.png        | Bin
 data/gui/{ => icons}/android/nitro_empty.png  | Bin
 data/gui/{ => icons}/android/pause.png        | Bin
 .../{ => icons}/android/steering_wheel.png    | Bin
 .../{ => icons}/android/thunderbird_reset.png | Bin
 data/gui/{ => icons}/android/up_down.png      | Bin
 data/gui/{ => icons}/android/wing_mirror.png  | Bin
 data/gui/{ => icons}/back.png                 | Bin
 data/gui/{ => icons}/banana.png               | Bin
 data/gui/{ => icons}/blue_arrow.png           | Bin
 data/gui/{ => icons}/blue_flag.png            | Bin
 data/gui/{ => icons}/blue_plus.png            | Bin
 data/gui/{ => icons}/bomb_icon.png            | Bin
 data/gui/{ => icons}/challenge.png            | Bin
 data/gui/{ => icons}/crown.png                | Bin
 data/gui/{ => icons}/cup_bronze.png           | Bin
 data/gui/{ => icons}/cup_gold.png             | Bin
 data/gui/{ => icons}/cup_platinum.png         | Bin
 data/gui/{ => icons}/cup_silver.png           | Bin
 data/gui/{ => icons}/difficulty_best.png      | Bin
 data/gui/{ => icons}/difficulty_easy.png      | Bin
 data/gui/{ => icons}/difficulty_hard.png      | Bin
 data/gui/{ => icons}/difficulty_medium.png    | Bin
 data/gui/{ => icons}/down.png                 | Bin
 data/gui/{ => icons}/dropdown.png             | Bin
 data/gui/{ => icons}/edit.png                 | Bin
 data/gui/{ => icons}/gamepad.png              | Bin
 data/gui/{ => icons}/gamepad_off.png          | Bin
 data/gui/{ => icons}/gauge_empty.png          | Bin
 data/gui/{ => icons}/gauge_full.png           | Bin
 data/gui/{ => icons}/gauge_full_bright.png    | Bin
 data/gui/{ => icons}/gauge_goal.png           | Bin
 data/gui/{ => icons}/ghost_plus.png           | Bin
 data/gui/{ => icons}/gift.png                 | Bin
 data/gui/{ => icons}/gp_copy.png              | Bin
 data/gui/{ => icons}/gp_edit.png              | Bin
 data/gui/{ => icons}/gp_new.png               | Bin
 data/gui/{ => icons}/gp_remove.png            | Bin
 data/gui/{ => icons}/gpeditor.png             | Bin
 data/gui/{ => icons}/green_check.png          | Bin
 data/gui/{ => icons}/gui_lock.png             | Bin
 data/gui/{ => icons}/heart.png                | Bin
 data/gui/{ => icons}/hourglass.png            | Bin
 data/gui/{ => icons}/icons-frame.png          | Bin
 data/gui/{ => icons}/karts.png                | Bin
 data/gui/{ => icons}/keyboard.png             | Bin
 data/gui/{ => icons}/loading.png              | Bin
 data/gui/{ => icons}/logo.png                 | Bin
 data/gui/{ => icons}/logo_slim.png            | Bin
 data/gui/{ => icons}/main_about.png           | Bin
 data/gui/{ => icons}/main_help.png            | Bin
 data/gui/{ => icons}/main_network.png         | Bin
 data/gui/{ => icons}/main_options.png         | Bin
 data/gui/{ => icons}/main_quit.png            | Bin
 data/gui/{ => icons}/main_race.png            | Bin
 data/gui/{ => icons}/main_race_multi.png      | Bin
 data/gui/{ => icons}/mass.png                 | Bin
 data/gui/{ => icons}/materials.xml            |   0
 data/gui/{ => icons}/menu_addons.png          | Bin
 data/gui/{ => icons}/menu_addons_focus.png    | Bin
 data/gui/{ => icons}/menu_multi.png           | Bin
 data/gui/{ => icons}/menu_multi_focus.png     | Bin
 data/gui/{ => icons}/menu_online.png          | Bin
 data/gui/{ => icons}/menu_online_focus.png    | Bin
 data/gui/{ => icons}/menu_race.png            | Bin
 data/gui/{ => icons}/menu_race_focus.png      | Bin
 data/gui/{ => icons}/menu_story.png           | Bin
 data/gui/{ => icons}/menu_story_focus.png     | Bin
 data/gui/{ => icons}/mode_3strikes.png        | Bin
 data/gui/{ => icons}/mode_easter.png          | Bin
 data/gui/{ => icons}/mode_ftl.png             | Bin
 data/gui/{ => icons}/mode_ghost.png           | Bin
 data/gui/{ => icons}/mode_normal.png          | Bin
 data/gui/{ => icons}/mode_soccer.png          | Bin
 data/gui/{ => icons}/mode_tt.png              | Bin
 data/gui/{ => icons}/mystery_unlock.png       | Bin
 data/gui/{ => icons}/networking_icon.png      | Bin
 data/gui/{ => icons}/nitro.png                | Bin
 data/gui/{ => icons}/no-package-featured.png  | Bin
 data/gui/{ => icons}/no-package.png           | Bin
 data/gui/{ => icons}/notes.png                | Bin
 .../{ => icons}/online/menu_create_server.png | Bin
 .../online/menu_create_server_hover.png       | Bin
 .../{ => icons}/online/menu_find_server.png   | Bin
 .../online/menu_find_server_hover.png         | Bin
 .../{ => icons}/online/menu_quick_play.png    | Bin
 .../online/menu_quick_play_hover.png          | Bin
 data/gui/{ => icons}/options_audio.png        | Bin
 data/gui/{ => icons}/options_input.png        | Bin
 data/gui/{ => icons}/options_language.png     | Bin
 data/gui/{ => icons}/options_players.png      | Bin
 data/gui/{ => icons}/options_ui.png           | Bin
 data/gui/{ => icons}/options_video.png        | Bin
 data/gui/{ => icons}/package-featured.png     | Bin
 data/gui/{ => icons}/package-uninstall.png    | Bin
 data/gui/{ => icons}/package-update.png       | Bin
 data/gui/{ => icons}/package.png              | Bin
 data/gui/{ => icons}/power.png                | Bin
 data/gui/{ => icons}/race_giveup.png          | Bin
 data/gui/{ => icons}/random_kart.png          | Bin
 data/gui/{ => icons}/red_arrow.png            | Bin
 data/gui/{ => icons}/red_flag.png             | Bin
 data/gui/{ => icons}/red_mark.png             | Bin
 data/gui/{ => icons}/remove.png               | Bin
 data/gui/{ => icons}/rename.png               | Bin
 data/gui/{ => icons}/restart.png              | Bin
 data/gui/{ => icons}/save.png                 | Bin
 data/gui/{ => icons}/screen1610.png           | Bin
 data/gui/{ => icons}/screen169.png            | Bin
 data/gui/{ => icons}/screen32.png             | Bin
 data/gui/{ => icons}/screen43.png             | Bin
 data/gui/{ => icons}/screen53.png             | Bin
 data/gui/{ => icons}/screen54.png             | Bin
 data/gui/{ => icons}/screen_other.png         | Bin
 data/gui/{ => icons}/scroll_down.png          | Bin
 data/gui/{ => icons}/scroll_up.png            | Bin
 data/gui/{ => icons}/search.png               | Bin
 data/gui/{ => icons}/slipstream_icon.png      | Bin
 data/gui/{ => icons}/soccer_ball_blue.png     | Bin
 data/gui/{ => icons}/soccer_ball_normal.png   | Bin
 data/gui/{ => icons}/soccer_ball_red.png      | Bin
 data/gui/{ => icons}/speed.png                | Bin
 data/gui/{ => icons}/speedback.png            | Bin
 data/gui/{ => icons}/speedfore.png            | Bin
 data/gui/{ => icons}/story_mode_book.png      | Bin
 data/gui/{ => icons}/top_bar.png              | Bin
 data/gui/{ => icons}/track_random.png         | Bin
 data/gui/{ => icons}/tutorial.png             | Bin
 data/gui/{ => icons}/up.png                   | Bin
 data/gui/{ => icons}/weapons.png              | Bin
 data/gui/{ => screens}/addons_screen.stkgui   |  12 +++---
 data/gui/{ => screens}/arenas.stkgui          |   2 +-
 data/gui/{ => screens}/credits.stkgui         |   4 +-
 data/gui/{ => screens}/easter_egg.stkgui      |   2 +-
 data/gui/{ => screens}/edit_gp.stkgui         |  14 +++----
 data/gui/{ => screens}/edit_track.stkgui      |   0
 .../gui/{ => screens}/feature_unlocked.stkgui |   0
 .../ghost_replay_selection.stkgui             |   8 ++--
 data/gui/{ => screens}/gp_info.stkgui         |   6 +--
 .../{ => screens}/grand_prix_editor.stkgui    |  12 +++---
 data/gui/{ => screens}/grand_prix_lose.stkgui |   0
 data/gui/{ => screens}/grand_prix_win.stkgui  |   0
 data/gui/{ => screens}/help1.stkgui           |  28 ++++++-------
 data/gui/{ => screens}/help2.stkgui           |  30 +++++++-------
 data/gui/{ => screens}/help3.stkgui           |  16 ++++----
 data/gui/{ => screens}/help4.stkgui           |  18 ++++-----
 data/gui/{ => screens}/help5.stkgui           |  22 +++++-----
 data/gui/{ => screens}/help6.stkgui           |  26 ++++++------
 data/gui/{ => screens}/help7.stkgui           |  24 +++++------
 data/gui/{ => screens}/karts.stkgui           |   2 +-
 data/gui/{ => screens}/main_menu.stkgui       |  38 +++++++++---------
 .../{ => screens}/online/create_server.stkgui |  20 ++++-----
 .../{ => screens}/online/guest_login.stkgui   |  12 +++---
 data/gui/{ => screens}/online/lan.stkgui      |  10 ++---
 .../online/lobby_settings.stkgui              |   2 +-
 .../online/networking_lobby.stkgui            |   6 +--
 data/gui/{ => screens}/online/online.stkgui   |  12 +++---
 .../online/profile_achievements.stkgui        |   2 +-
 .../online/profile_achievements_tab.stkgui    |   8 ++--
 .../online/profile_friends.stkgui             |   8 ++--
 .../online/profile_overview.stkgui            |  10 ++---
 .../online/profile_servers.stkgui             |  10 ++---
 .../online/profile_settings.stkgui            |   8 ++--
 data/gui/{ => screens}/online/register.stkgui |  12 +++---
 .../online/server_selection.stkgui            |   4 +-
 .../{ => screens}/online/user_search.stkgui   |   2 +-
 data/gui/{ => screens}/options_audio.stkgui   |  14 +++----
 data/gui/{ => screens}/options_device.stkgui  |  14 +++----
 data/gui/{ => screens}/options_input.stkgui   |  14 +++----
 .../gui/{ => screens}/options_language.stkgui |  14 +++----
 data/gui/{ => screens}/options_players.stkgui |  12 +++---
 data/gui/{ => screens}/options_ui.stkgui      |  14 +++----
 data/gui/{ => screens}/options_video.stkgui   |  14 +++----
 data/gui/{ => screens}/race_result.stkgui     |   0
 data/gui/{ => screens}/race_setup.stkgui      |  10 ++---
 data/gui/{ => screens}/soccer_setup.stkgui    |   6 +--
 data/gui/{ => screens}/track_info.stkgui      |  10 ++---
 data/gui/{ => screens}/tracks.stkgui          |   2 +-
 data/gui/{ => screens}/tracks_and_gp.stkgui   |   2 +-
 data/gui/{ => screens}/user_screen.stkgui     |  14 +++----
 data/gui/{ => screens}/user_screen_tab.stkgui |  26 ++++++------
 src/config/player_profile.cpp                 |   2 +-
 src/graphics/irr_driver.cpp                   |   6 +--
 src/graphics/particle_emitter.cpp             |   2 +-
 src/guiengine/engine.cpp                      |   2 +-
 src/guiengine/layout_manager.cpp              |   2 +-
 src/guiengine/modaldialog.cpp                 |   2 +-
 src/guiengine/screen.cpp                      |   2 +-
 src/guiengine/skin.cpp                        |  20 ++++-----
 src/guiengine/widgets/icon_button_widget.cpp  |   8 ++--
 src/guiengine/widgets/kart_stats_widget.cpp   |   8 ++--
 src/guiengine/widgets/model_view_widget.cpp   |   4 +-
 src/guiengine/widgets/player_name_spinner.cpp |   2 +-
 src/guiengine/widgets/ribbon_widget.cpp       |   4 +-
 src/io/file_manager.cpp                       |   6 ++-
 src/io/file_manager.hpp                       |   3 +-
 src/main.cpp                                  |  12 +++---
 src/modes/capture_the_flag.cpp                |   4 +-
 src/modes/three_strikes_battle.cpp            |   2 +-
 src/modes/world.cpp                           |   4 +-
 src/race/race_manager.hpp                     |  12 +++---
 src/states_screens/addons_screen.cpp          |  12 +++---
 src/states_screens/arenas_screen.cpp          |   2 +-
 .../dialogs/ghost_replay_info_dialog.cpp      |   2 +-
 .../dialogs/network_user_dialog.cpp           |   2 +-
 .../dialogs/select_challenge.cpp              |   2 +-
 src/states_screens/easter_egg_screen.cpp      |   2 +-
 src/states_screens/edit_gp_screen.cpp         |   2 +-
 src/states_screens/feature_unlocked.cpp       |   8 ++--
 src/states_screens/ghost_replay_selection.cpp |   2 +-
 src/states_screens/gp_info_screen.cpp         |   4 +-
 .../grand_prix_editor_screen.cpp              |   2 +-
 src/states_screens/grand_prix_win.cpp         |   4 +-
 src/states_screens/kart_selection.cpp         |   2 +-
 src/states_screens/main_menu_screen.cpp       |   2 +-
 src/states_screens/network_kart_selection.cpp |   2 +-
 src/states_screens/networking_lobby.cpp       |   8 ++--
 src/states_screens/options_screen_input.cpp   |   6 +--
 src/states_screens/options_screen_video.cpp   |  14 +++----
 src/states_screens/race_gui.cpp               |  12 +++---
 src/states_screens/race_gui_base.cpp          |  12 +++---
 src/states_screens/race_gui_multitouch.cpp    |  22 +++++-----
 src/states_screens/race_gui_overworld.cpp     |  14 +++----
 src/states_screens/race_result_gui.cpp        |  14 +++----
 src/states_screens/race_setup_screen.cpp      |   2 +-
 src/states_screens/server_selection.cpp       |   4 +-
 src/states_screens/track_info_screen.cpp      |   4 +-
 src/states_screens/tracks_and_gp_screen.cpp   |   4 +-
 src/states_screens/tracks_screen.cpp          |   6 +--
 261 files changed, 474 insertions(+), 471 deletions(-)
 rename data/gui/{ => dialogs}/addons_loading.stkgui (89%)
 rename data/gui/{ => dialogs}/android/init_android.stkgui (92%)
 rename data/gui/{ => dialogs}/android/multitouch_settings.stkgui (100%)
 rename data/gui/{ => dialogs}/confirm_dialog.stkgui (76%)
 rename data/gui/{ => dialogs}/confirm_resolution_dialog.stkgui (100%)
 rename data/gui/{ => dialogs}/custom_video_settings.stkgui (100%)
 rename data/gui/{ => dialogs}/debug_slider.stkgui (100%)
 rename data/gui/{ => dialogs}/general_text_field_dialog.stkgui (100%)
 rename data/gui/{ => dialogs}/ghost_replay_info_dialog.stkgui (92%)
 rename data/gui/{ => dialogs}/kart_color_slider.stkgui (100%)
 rename data/gui/{ => dialogs}/online/change_password.stkgui (97%)
 rename data/gui/{ => dialogs}/online/notification_dialog.stkgui (92%)
 rename data/gui/{ => dialogs}/online/player_rankings_dialog.stkgui (89%)
 rename data/gui/{ => dialogs}/online/recovery_info.stkgui (96%)
 rename data/gui/{ => dialogs}/online/recovery_input.stkgui (97%)
 rename data/gui/{ => dialogs}/online/registration_terms.stkgui (96%)
 rename data/gui/{ => dialogs}/online/server_info_dialog.stkgui (95%)
 rename data/gui/{ => dialogs}/online/splitscreen_player_dialog.stkgui (95%)
 rename data/gui/{ => dialogs}/online/user_info_dialog.stkgui (91%)
 rename data/gui/{ => dialogs}/online/vote_dialog.stkgui (97%)
 rename data/gui/{ => dialogs}/overworld_dialog.stkgui (85%)
 rename data/gui/{ => dialogs}/press_a_key_dialog.stkgui (100%)
 rename data/gui/{ => dialogs}/race_paused_dialog.stkgui (85%)
 rename data/gui/{ => dialogs}/select_challenge.stkgui (85%)
 rename data/gui/{ => dialogs}/select_challenge_nobest.stkgui (86%)
 rename data/gui/{ => dialogs}/tutorial_message_dialog.stkgui (100%)
 rename data/gui/{ => icons}/License.txt (100%)
 rename data/gui/{ => icons}/addons.png (100%)
 rename data/gui/{ => icons}/android/blur_bg_button.png (100%)
 rename data/gui/{ => icons}/android/blur_bg_button_focus.png (100%)
 rename data/gui/{ => icons}/android/drift.png (100%)
 rename data/gui/{ => icons}/android/license.txt (100%)
 rename data/gui/{ => icons}/android/nitro.png (100%)
 rename data/gui/{ => icons}/android/nitro_empty.png (100%)
 rename data/gui/{ => icons}/android/pause.png (100%)
 rename data/gui/{ => icons}/android/steering_wheel.png (100%)
 rename data/gui/{ => icons}/android/thunderbird_reset.png (100%)
 rename data/gui/{ => icons}/android/up_down.png (100%)
 rename data/gui/{ => icons}/android/wing_mirror.png (100%)
 rename data/gui/{ => icons}/back.png (100%)
 rename data/gui/{ => icons}/banana.png (100%)
 rename data/gui/{ => icons}/blue_arrow.png (100%)
 rename data/gui/{ => icons}/blue_flag.png (100%)
 rename data/gui/{ => icons}/blue_plus.png (100%)
 rename data/gui/{ => icons}/bomb_icon.png (100%)
 rename data/gui/{ => icons}/challenge.png (100%)
 rename data/gui/{ => icons}/crown.png (100%)
 rename data/gui/{ => icons}/cup_bronze.png (100%)
 rename data/gui/{ => icons}/cup_gold.png (100%)
 rename data/gui/{ => icons}/cup_platinum.png (100%)
 rename data/gui/{ => icons}/cup_silver.png (100%)
 rename data/gui/{ => icons}/difficulty_best.png (100%)
 rename data/gui/{ => icons}/difficulty_easy.png (100%)
 rename data/gui/{ => icons}/difficulty_hard.png (100%)
 rename data/gui/{ => icons}/difficulty_medium.png (100%)
 rename data/gui/{ => icons}/down.png (100%)
 rename data/gui/{ => icons}/dropdown.png (100%)
 rename data/gui/{ => icons}/edit.png (100%)
 rename data/gui/{ => icons}/gamepad.png (100%)
 rename data/gui/{ => icons}/gamepad_off.png (100%)
 rename data/gui/{ => icons}/gauge_empty.png (100%)
 rename data/gui/{ => icons}/gauge_full.png (100%)
 rename data/gui/{ => icons}/gauge_full_bright.png (100%)
 rename data/gui/{ => icons}/gauge_goal.png (100%)
 rename data/gui/{ => icons}/ghost_plus.png (100%)
 rename data/gui/{ => icons}/gift.png (100%)
 rename data/gui/{ => icons}/gp_copy.png (100%)
 rename data/gui/{ => icons}/gp_edit.png (100%)
 rename data/gui/{ => icons}/gp_new.png (100%)
 rename data/gui/{ => icons}/gp_remove.png (100%)
 rename data/gui/{ => icons}/gpeditor.png (100%)
 rename data/gui/{ => icons}/green_check.png (100%)
 rename data/gui/{ => icons}/gui_lock.png (100%)
 rename data/gui/{ => icons}/heart.png (100%)
 rename data/gui/{ => icons}/hourglass.png (100%)
 rename data/gui/{ => icons}/icons-frame.png (100%)
 rename data/gui/{ => icons}/karts.png (100%)
 rename data/gui/{ => icons}/keyboard.png (100%)
 rename data/gui/{ => icons}/loading.png (100%)
 rename data/gui/{ => icons}/logo.png (100%)
 rename data/gui/{ => icons}/logo_slim.png (100%)
 rename data/gui/{ => icons}/main_about.png (100%)
 rename data/gui/{ => icons}/main_help.png (100%)
 rename data/gui/{ => icons}/main_network.png (100%)
 rename data/gui/{ => icons}/main_options.png (100%)
 rename data/gui/{ => icons}/main_quit.png (100%)
 rename data/gui/{ => icons}/main_race.png (100%)
 rename data/gui/{ => icons}/main_race_multi.png (100%)
 rename data/gui/{ => icons}/mass.png (100%)
 rename data/gui/{ => icons}/materials.xml (100%)
 rename data/gui/{ => icons}/menu_addons.png (100%)
 rename data/gui/{ => icons}/menu_addons_focus.png (100%)
 rename data/gui/{ => icons}/menu_multi.png (100%)
 rename data/gui/{ => icons}/menu_multi_focus.png (100%)
 rename data/gui/{ => icons}/menu_online.png (100%)
 rename data/gui/{ => icons}/menu_online_focus.png (100%)
 rename data/gui/{ => icons}/menu_race.png (100%)
 rename data/gui/{ => icons}/menu_race_focus.png (100%)
 rename data/gui/{ => icons}/menu_story.png (100%)
 rename data/gui/{ => icons}/menu_story_focus.png (100%)
 rename data/gui/{ => icons}/mode_3strikes.png (100%)
 rename data/gui/{ => icons}/mode_easter.png (100%)
 rename data/gui/{ => icons}/mode_ftl.png (100%)
 rename data/gui/{ => icons}/mode_ghost.png (100%)
 rename data/gui/{ => icons}/mode_normal.png (100%)
 rename data/gui/{ => icons}/mode_soccer.png (100%)
 rename data/gui/{ => icons}/mode_tt.png (100%)
 rename data/gui/{ => icons}/mystery_unlock.png (100%)
 rename data/gui/{ => icons}/networking_icon.png (100%)
 rename data/gui/{ => icons}/nitro.png (100%)
 rename data/gui/{ => icons}/no-package-featured.png (100%)
 rename data/gui/{ => icons}/no-package.png (100%)
 rename data/gui/{ => icons}/notes.png (100%)
 rename data/gui/{ => icons}/online/menu_create_server.png (100%)
 rename data/gui/{ => icons}/online/menu_create_server_hover.png (100%)
 rename data/gui/{ => icons}/online/menu_find_server.png (100%)
 rename data/gui/{ => icons}/online/menu_find_server_hover.png (100%)
 rename data/gui/{ => icons}/online/menu_quick_play.png (100%)
 rename data/gui/{ => icons}/online/menu_quick_play_hover.png (100%)
 rename data/gui/{ => icons}/options_audio.png (100%)
 rename data/gui/{ => icons}/options_input.png (100%)
 rename data/gui/{ => icons}/options_language.png (100%)
 rename data/gui/{ => icons}/options_players.png (100%)
 rename data/gui/{ => icons}/options_ui.png (100%)
 rename data/gui/{ => icons}/options_video.png (100%)
 rename data/gui/{ => icons}/package-featured.png (100%)
 rename data/gui/{ => icons}/package-uninstall.png (100%)
 rename data/gui/{ => icons}/package-update.png (100%)
 rename data/gui/{ => icons}/package.png (100%)
 rename data/gui/{ => icons}/power.png (100%)
 rename data/gui/{ => icons}/race_giveup.png (100%)
 rename data/gui/{ => icons}/random_kart.png (100%)
 rename data/gui/{ => icons}/red_arrow.png (100%)
 rename data/gui/{ => icons}/red_flag.png (100%)
 rename data/gui/{ => icons}/red_mark.png (100%)
 rename data/gui/{ => icons}/remove.png (100%)
 rename data/gui/{ => icons}/rename.png (100%)
 rename data/gui/{ => icons}/restart.png (100%)
 rename data/gui/{ => icons}/save.png (100%)
 rename data/gui/{ => icons}/screen1610.png (100%)
 rename data/gui/{ => icons}/screen169.png (100%)
 rename data/gui/{ => icons}/screen32.png (100%)
 rename data/gui/{ => icons}/screen43.png (100%)
 rename data/gui/{ => icons}/screen53.png (100%)
 rename data/gui/{ => icons}/screen54.png (100%)
 rename data/gui/{ => icons}/screen_other.png (100%)
 rename data/gui/{ => icons}/scroll_down.png (100%)
 rename data/gui/{ => icons}/scroll_up.png (100%)
 rename data/gui/{ => icons}/search.png (100%)
 rename data/gui/{ => icons}/slipstream_icon.png (100%)
 rename data/gui/{ => icons}/soccer_ball_blue.png (100%)
 rename data/gui/{ => icons}/soccer_ball_normal.png (100%)
 rename data/gui/{ => icons}/soccer_ball_red.png (100%)
 rename data/gui/{ => icons}/speed.png (100%)
 rename data/gui/{ => icons}/speedback.png (100%)
 rename data/gui/{ => icons}/speedfore.png (100%)
 rename data/gui/{ => icons}/story_mode_book.png (100%)
 rename data/gui/{ => icons}/top_bar.png (100%)
 rename data/gui/{ => icons}/track_random.png (100%)
 rename data/gui/{ => icons}/tutorial.png (100%)
 rename data/gui/{ => icons}/up.png (100%)
 rename data/gui/{ => icons}/weapons.png (100%)
 rename data/gui/{ => screens}/addons_screen.stkgui (88%)
 rename data/gui/{ => screens}/arenas.stkgui (92%)
 rename data/gui/{ => screens}/credits.stkgui (84%)
 rename data/gui/{ => screens}/easter_egg.stkgui (92%)
 rename data/gui/{ => screens}/edit_gp.stkgui (86%)
 rename data/gui/{ => screens}/edit_track.stkgui (100%)
 rename data/gui/{ => screens}/feature_unlocked.stkgui (100%)
 rename data/gui/{ => screens}/ghost_replay_selection.stkgui (93%)
 rename data/gui/{ => screens}/gp_info.stkgui (95%)
 rename data/gui/{ => screens}/grand_prix_editor.stkgui (90%)
 rename data/gui/{ => screens}/grand_prix_lose.stkgui (100%)
 rename data/gui/{ => screens}/grand_prix_win.stkgui (100%)
 rename data/gui/{ => screens}/help1.stkgui (89%)
 rename data/gui/{ => screens}/help2.stkgui (91%)
 rename data/gui/{ => screens}/help3.stkgui (94%)
 rename data/gui/{ => screens}/help4.stkgui (90%)
 rename data/gui/{ => screens}/help5.stkgui (89%)
 rename data/gui/{ => screens}/help6.stkgui (90%)
 rename data/gui/{ => screens}/help7.stkgui (91%)
 rename data/gui/{ => screens}/karts.stkgui (92%)
 rename data/gui/{ => screens}/main_menu.stkgui (78%)
 rename data/gui/{ => screens}/online/create_server.stkgui (91%)
 rename data/gui/{ => screens}/online/guest_login.stkgui (89%)
 rename data/gui/{ => screens}/online/lan.stkgui (71%)
 rename data/gui/{ => screens}/online/lobby_settings.stkgui (94%)
 rename data/gui/{ => screens}/online/networking_lobby.stkgui (90%)
 rename data/gui/{ => screens}/online/online.stkgui (75%)
 rename data/gui/{ => screens}/online/profile_achievements.stkgui (84%)
 rename data/gui/{ => screens}/online/profile_achievements_tab.stkgui (82%)
 rename data/gui/{ => screens}/online/profile_friends.stkgui (88%)
 rename data/gui/{ => screens}/online/profile_overview.stkgui (79%)
 rename data/gui/{ => screens}/online/profile_servers.stkgui (67%)
 rename data/gui/{ => screens}/online/profile_settings.stkgui (85%)
 rename data/gui/{ => screens}/online/register.stkgui (94%)
 rename data/gui/{ => screens}/online/server_selection.stkgui (89%)
 rename data/gui/{ => screens}/online/user_search.stkgui (90%)
 rename data/gui/{ => screens}/options_audio.stkgui (92%)
 rename data/gui/{ => screens}/options_device.stkgui (89%)
 rename data/gui/{ => screens}/options_input.stkgui (87%)
 rename data/gui/{ => screens}/options_language.stkgui (84%)
 rename data/gui/{ => screens}/options_players.stkgui (88%)
 rename data/gui/{ => screens}/options_ui.stkgui (93%)
 rename data/gui/{ => screens}/options_video.stkgui (93%)
 rename data/gui/{ => screens}/race_result.stkgui (100%)
 rename data/gui/{ => screens}/race_setup.stkgui (87%)
 rename data/gui/{ => screens}/soccer_setup.stkgui (90%)
 rename data/gui/{ => screens}/track_info.stkgui (91%)
 rename data/gui/{ => screens}/tracks.stkgui (96%)
 rename data/gui/{ => screens}/tracks_and_gp.stkgui (93%)
 rename data/gui/{ => screens}/user_screen.stkgui (93%)
 rename data/gui/{ => screens}/user_screen_tab.stkgui (90%)

diff --git a/data/gui/addons_loading.stkgui b/data/gui/dialogs/addons_loading.stkgui
similarity index 89%
rename from data/gui/addons_loading.stkgui
rename to data/gui/dialogs/addons_loading.stkgui
index d51e3f12c..0c86b451f 100644
--- a/data/gui/addons_loading.stkgui
+++ b/data/gui/dialogs/addons_loading.stkgui
@@ -3,7 +3,7 @@
     <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
         <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row">
             <div width="40%" height="100%" layout="vertical-row">
-                <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png" />
+                <icon id="icon" align="center" proportion="8" width="100%" icon="gui/icons/loading.png" />
                 <spacer proportion="1" />
             </div>
             <spacer proportion="1" />
@@ -27,13 +27,13 @@
         <div width="80%" proportion="5" 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/package-update.png"
+                             icon="gui/icons/package-update.png"
                              I18N="Add-on screen action"  text="Install" />
                 <icon-button id="uninstall" width="128" height="128"
-                             icon="gui/package-uninstall.png"
+                             icon="gui/icons/package-uninstall.png"
                              I18N="Add-on screen action" text="Uninstall" />
                 <icon-button id="back" width="128" height="128"
-                             icon="gui/back.png"
+                             icon="gui/icons/back.png"
                              I18N="Add-on screen action" text="Back" />
             </buttonbar>
             <progressbar id="progress" x="0" y="20%" width="100%" height="30%" />
diff --git a/data/gui/android/init_android.stkgui b/data/gui/dialogs/android/init_android.stkgui
similarity index 92%
rename from data/gui/android/init_android.stkgui
rename to data/gui/dialogs/android/init_android.stkgui
index 81d9c13c9..60f71ec8b 100644
--- a/data/gui/android/init_android.stkgui
+++ b/data/gui/dialogs/android/init_android.stkgui
@@ -8,9 +8,9 @@
             <spacer height="7%" width="10"/>
 
             <ribbon id="control_type" proportion="1" width="100%" align="center">
-                <icon-button id="accelerometer" width="fit" height="fit" icon="gui/difficulty_medium.png"
+                <icon-button id="accelerometer" width="fit" height="fit" icon="gui/icons/difficulty_medium.png"
                         I18N="Control type" text="Accelerometer"/>
-                <icon-button id="steering_wheel" width="fit" height="fit" icon="gui/difficulty_hard.png"
+                <icon-button id="steering_wheel" width="fit" height="fit" icon="gui/icons/difficulty_hard.png"
                         I18N="Control type"  text="Steering wheel"/>
             </ribbon>
 
diff --git a/data/gui/android/multitouch_settings.stkgui b/data/gui/dialogs/android/multitouch_settings.stkgui
similarity index 100%
rename from data/gui/android/multitouch_settings.stkgui
rename to data/gui/dialogs/android/multitouch_settings.stkgui
diff --git a/data/gui/confirm_dialog.stkgui b/data/gui/dialogs/confirm_dialog.stkgui
similarity index 76%
rename from data/gui/confirm_dialog.stkgui
rename to data/gui/dialogs/confirm_dialog.stkgui
index 70334d1d1..cd7c5add3 100644
--- a/data/gui/confirm_dialog.stkgui
+++ b/data/gui/dialogs/confirm_dialog.stkgui
@@ -7,10 +7,10 @@
 
         <buttonbar id="buttons" height="30%" width="30%" align="center">
 
-            <icon-button id="confirm" icon="gui/green_check.png" I18N="In a 'are you sure?' dialog"
+            <icon-button id="confirm" icon="gui/icons/green_check.png" I18N="In a 'are you sure?' dialog"
                 text="Yes" align="center"/>
 
-            <icon-button id="cancel" icon="gui/remove.png" I18N="In a 'are you sure?' dialog"
+            <icon-button id="cancel" icon="gui/icons/remove.png" I18N="In a 'are you sure?' dialog"
                 text="Cancel" align="center"/>
 
         </buttonbar>
diff --git a/data/gui/confirm_resolution_dialog.stkgui b/data/gui/dialogs/confirm_resolution_dialog.stkgui
similarity index 100%
rename from data/gui/confirm_resolution_dialog.stkgui
rename to data/gui/dialogs/confirm_resolution_dialog.stkgui
diff --git a/data/gui/custom_video_settings.stkgui b/data/gui/dialogs/custom_video_settings.stkgui
similarity index 100%
rename from data/gui/custom_video_settings.stkgui
rename to data/gui/dialogs/custom_video_settings.stkgui
diff --git a/data/gui/debug_slider.stkgui b/data/gui/dialogs/debug_slider.stkgui
similarity index 100%
rename from data/gui/debug_slider.stkgui
rename to data/gui/dialogs/debug_slider.stkgui
diff --git a/data/gui/general_text_field_dialog.stkgui b/data/gui/dialogs/general_text_field_dialog.stkgui
similarity index 100%
rename from data/gui/general_text_field_dialog.stkgui
rename to data/gui/dialogs/general_text_field_dialog.stkgui
diff --git a/data/gui/ghost_replay_info_dialog.stkgui b/data/gui/dialogs/ghost_replay_info_dialog.stkgui
similarity index 92%
rename from data/gui/ghost_replay_info_dialog.stkgui
rename to data/gui/dialogs/ghost_replay_info_dialog.stkgui
index 3f64cb386..2182d7116 100644
--- a/data/gui/ghost_replay_info_dialog.stkgui
+++ b/data/gui/dialogs/ghost_replay_info_dialog.stkgui
@@ -39,16 +39,16 @@
                 <div width="95%" height="60%" align="center">
                     <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
                         <icon-button id="start" width="128" height="128"
-                                     icon="gui/green_check.png"
+                                     icon="gui/icons/green_check.png"
                                      I18N="Ghost replay info screen action" text="Start Race" />
                         <icon-button id="add-ghost-to-compare" width="128" height="128"
-                                     icon="gui/ghost_plus.png"
+                                     icon="gui/icons/ghost_plus.png"
                                      I18N="Ghost replay info screen action" text="Compare ghost" />
                         <icon-button id="remove" width="128" height="128"
-                                     icon="gui/remove.png"
+                                     icon="gui/icons/remove.png"
                                      I18N="Ghost replay info action" text="Remove" />
                         <icon-button id="back" width="128" height="128"
-                                     icon="gui/back.png"
+                                     icon="gui/icons/back.png"
                                      I18N="Ghost replay info action" text="Back" />
                     </buttonbar>
                 </div>
diff --git a/data/gui/kart_color_slider.stkgui b/data/gui/dialogs/kart_color_slider.stkgui
similarity index 100%
rename from data/gui/kart_color_slider.stkgui
rename to data/gui/dialogs/kart_color_slider.stkgui
diff --git a/data/gui/online/change_password.stkgui b/data/gui/dialogs/online/change_password.stkgui
similarity index 97%
rename from data/gui/online/change_password.stkgui
rename to data/gui/dialogs/online/change_password.stkgui
index 02b20c367..8809bb35c 100644
--- a/data/gui/online/change_password.stkgui
+++ b/data/gui/dialogs/online/change_password.stkgui
@@ -35,9 +35,9 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="90%" height="16%" align="center">
-                <icon-button id="submit" width="64" height="64" icon="gui/green_check.png"
+                <icon-button id="submit" width="64" height="64" icon="gui/icons/green_check.png"
                              I18N="In the change password dialog"  text="Submit" label_location="bottom"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                <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>
     </div>
diff --git a/data/gui/online/notification_dialog.stkgui b/data/gui/dialogs/online/notification_dialog.stkgui
similarity index 92%
rename from data/gui/online/notification_dialog.stkgui
rename to data/gui/dialogs/online/notification_dialog.stkgui
index 034ea31c1..0495ce56c 100644
--- a/data/gui/online/notification_dialog.stkgui
+++ b/data/gui/dialogs/online/notification_dialog.stkgui
@@ -7,9 +7,9 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="90%" height="30%" align="center">
-            <icon-button id="view" width="64" height="64" icon="gui/difficulty_medium.png"
+            <icon-button id="view" width="64" height="64" icon="gui/icons/difficulty_medium.png"
                          I18N="User info dialog"  text="View" label_location="bottom"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
         </buttonbar>
     </div>
diff --git a/data/gui/online/player_rankings_dialog.stkgui b/data/gui/dialogs/online/player_rankings_dialog.stkgui
similarity index 89%
rename from data/gui/online/player_rankings_dialog.stkgui
rename to data/gui/dialogs/online/player_rankings_dialog.stkgui
index e9fa097dd..b930b6c2e 100644
--- a/data/gui/online/player_rankings_dialog.stkgui
+++ b/data/gui/dialogs/online/player_rankings_dialog.stkgui
@@ -15,10 +15,10 @@
 
         <buttonbar id="options" width="90%" height="10%" align="center">
             <icon-button id="ok" width="16" height="16"
-                         icon="gui/green_check.png" text="OK"
+                         icon="gui/icons/green_check.png" text="OK"
                          label_location="bottom"/>
             <icon-button id="refresh" width="16" height="16"
-                         icon="gui/restart.png"
+                         icon="gui/icons/restart.png"
                          text="Refresh" label_location="bottom"/>
         </buttonbar>
         <spacer width="20" height="2%" />
diff --git a/data/gui/online/recovery_info.stkgui b/data/gui/dialogs/online/recovery_info.stkgui
similarity index 96%
rename from data/gui/online/recovery_info.stkgui
rename to data/gui/dialogs/online/recovery_info.stkgui
index 50ac5c186..e93b4b765 100644
--- a/data/gui/online/recovery_info.stkgui
+++ b/data/gui/dialogs/online/recovery_info.stkgui
@@ -12,7 +12,7 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="25%" height="15%" align="center">
-            <icon-button id="cancel" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="cancel" width="64" height="64" icon="gui/icons/green_check.png"
                 I18N="In the recovery dialog" text="Close" label_location="none"/>
         </buttonbar>
     </div>
diff --git a/data/gui/online/recovery_input.stkgui b/data/gui/dialogs/online/recovery_input.stkgui
similarity index 97%
rename from data/gui/online/recovery_input.stkgui
rename to data/gui/dialogs/online/recovery_input.stkgui
index 9dc2819c9..269af29a6 100644
--- a/data/gui/online/recovery_input.stkgui
+++ b/data/gui/dialogs/online/recovery_input.stkgui
@@ -34,9 +34,9 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="25%" proportion="1" align="center">
-            <icon-button id="submit" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="submit" width="64" height="64" icon="gui/icons/green_check.png"
                 I18N="In the recovery dialog" text="Submit" label_location="none"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            <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>
     </div>
diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/dialogs/online/registration_terms.stkgui
similarity index 96%
rename from data/gui/online/registration_terms.stkgui
rename to data/gui/dialogs/online/registration_terms.stkgui
index 1447495be..239e24d04 100644
--- a/data/gui/online/registration_terms.stkgui
+++ b/data/gui/dialogs/online/registration_terms.stkgui
@@ -23,9 +23,9 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="45%" height="14%" align="center">
-            <icon-button id="accept" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="accept" width="64" height="64" icon="gui/icons/green_check.png"
                 I18N="In the registration dialog" text="Accept" label_location="bottom"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                 I18N="In the registration dialog" text="Cancel" label_location="bottom"/>
         </buttonbar>
     </div>
diff --git a/data/gui/online/server_info_dialog.stkgui b/data/gui/dialogs/online/server_info_dialog.stkgui
similarity index 95%
rename from data/gui/online/server_info_dialog.stkgui
rename to data/gui/dialogs/online/server_info_dialog.stkgui
index 6a602f387..7dc722936 100644
--- a/data/gui/online/server_info_dialog.stkgui
+++ b/data/gui/dialogs/online/server_info_dialog.stkgui
@@ -12,9 +12,9 @@
             <textbox id="password" proportion="2" height="fit"/>
         </div>
         <buttonbar id="options" width="90%" height="15%" align="center">
-                <icon-button id="join" width="64" height="64" icon="gui/green_check.png"
+                <icon-button id="join" width="64" height="64" icon="gui/icons/green_check.png"
                              I18N="In the server info dialog"  text="Join" label_location="bottom"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                              I18N="In the server info dialog" text="Cancel" label_location="bottom"/>
         </buttonbar>
     </div>
diff --git a/data/gui/online/splitscreen_player_dialog.stkgui b/data/gui/dialogs/online/splitscreen_player_dialog.stkgui
similarity index 95%
rename from data/gui/online/splitscreen_player_dialog.stkgui
rename to data/gui/dialogs/online/splitscreen_player_dialog.stkgui
index 4fbcf1973..046b2c8a2 100644
--- a/data/gui/online/splitscreen_player_dialog.stkgui
+++ b/data/gui/dialogs/online/splitscreen_player_dialog.stkgui
@@ -33,13 +33,13 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="90%" height="20%" align="center">
-            <icon-button id="add" width="64" height="64" icon="gui/blue_plus.png"
+            <icon-button id="add" width="64" height="64" icon="gui/icons/blue_plus.png"
                          I18N="Splitscreen player in network"  text="Add player" label_location="bottom"/>
-            <icon-button id="connect" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="connect" width="64" height="64" icon="gui/icons/green_check.png"
                          I18N="Splitscreen player in network" text="All players ready" label_location="bottom"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                          I18N="Splitscreen player in network" text="Cancel" label_location="bottom"/>
-            <icon-button id="reset" width="64" height="64" icon="gui/remove.png"
+            <icon-button id="reset" width="64" height="64" icon="gui/icons/remove.png"
                          I18N="Splitscreen player in network" text="Clear added player" label_location="bottom"/>
         </buttonbar>
     </div>
diff --git a/data/gui/online/user_info_dialog.stkgui b/data/gui/dialogs/online/user_info_dialog.stkgui
similarity index 91%
rename from data/gui/online/user_info_dialog.stkgui
rename to data/gui/dialogs/online/user_info_dialog.stkgui
index 5de3d49c2..d7b9c3756 100644
--- a/data/gui/online/user_info_dialog.stkgui
+++ b/data/gui/dialogs/online/user_info_dialog.stkgui
@@ -20,17 +20,17 @@
         <spacer height="20" width="50"/>
 
         <buttonbar id="options" width="90%" height="20%" align="center">
-            <icon-button id="remove" width="64" height="64" icon="gui/package-uninstall.png"
+            <icon-button id="remove" width="64" height="64" icon="gui/icons/package-uninstall.png"
                          I18N="User info dialog"  text="Remove" label_location="bottom"/>
-            <icon-button id="friend" width="64" height="64" icon="gui/main_help.png"
+            <icon-button id="friend" width="64" height="64" icon="gui/icons/main_help.png"
                          I18N="User info dialog"  text="Add Friend" label_location="bottom"/>
-            <icon-button id="accept" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="accept" width="64" height="64" icon="gui/icons/green_check.png"
                          I18N="User info dialog"  text="Accept" label_location="bottom"/>
-            <icon-button id="decline" width="64" height="64" icon="gui/red_mark.png"
+            <icon-button id="decline" width="64" height="64" icon="gui/icons/red_mark.png"
                          I18N="User info dialog"  text="Decline" label_location="bottom"/>
-            <icon-button id="enter" width="64" height="64" icon="gui/difficulty_medium.png"
+            <icon-button id="enter" width="64" height="64" icon="gui/icons/difficulty_medium.png"
                          I18N="User info dialog"  text="View" label_location="bottom"/>
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                          I18N="User info dialog" text="Close" label_location="bottom"/>
         </buttonbar>
     </div>
diff --git a/data/gui/online/vote_dialog.stkgui b/data/gui/dialogs/online/vote_dialog.stkgui
similarity index 97%
rename from data/gui/online/vote_dialog.stkgui
rename to data/gui/dialogs/online/vote_dialog.stkgui
index 904deba58..3bd19ebbf 100644
--- a/data/gui/online/vote_dialog.stkgui
+++ b/data/gui/dialogs/online/vote_dialog.stkgui
@@ -17,7 +17,7 @@
         <spacer height="40" width="50"/>
 
         <buttonbar id="options" width="25%" height="20%" align="center">
-            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                 I18N="Vote dialog" text="Close" label_location="none"/>
         </buttonbar>
     </div>
diff --git a/data/gui/overworld_dialog.stkgui b/data/gui/dialogs/overworld_dialog.stkgui
similarity index 85%
rename from data/gui/overworld_dialog.stkgui
rename to data/gui/dialogs/overworld_dialog.stkgui
index 62c8453c5..f023697c6 100644
--- a/data/gui/overworld_dialog.stkgui
+++ b/data/gui/dialogs/overworld_dialog.stkgui
@@ -5,23 +5,23 @@
 
         <!-- FIXME: some play in proportions occur below because the text of an icon
                     button is added UNDER it and not within its allocated height -->
-        <icon-button id="backbtn" align="center" icon="gui/back.png" extend_label="200"
+        <icon-button id="backbtn" align="center" icon="gui/icons/back.png" extend_label="200"
                      I18N="In the in-game dialog" text="Back to Game" proportion="3"/>
 
         <spacer width="20" height="50" />
 
         <buttonbar id="choiceribbon" proportion="4" width="100%" align="center">
 
-            <icon-button id="selectkart" width="128" height="128" icon="gui/random_kart.png"
+            <icon-button id="selectkart" width="128" height="128" icon="gui/icons/random_kart.png"
                     I18N="In the in-game dialog" text="Select kart" word_wrap="true"/>
 
-            <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
+            <icon-button id="options" width="128" height="128" icon="gui/icons/main_options.png"
                          I18N="In the in-game dialog" text="Options" word_wrap="true"/>
 
-            <icon-button id="help" width="128" height="128" icon="gui/main_help.png"
+            <icon-button id="help" width="128" height="128" icon="gui/icons/main_help.png"
                     I18N="In the in-game dialog" text="Help" word_wrap="true"/>
 
-            <icon-button id="exit" width="128" height="128" icon="gui/main_quit.png"
+            <icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
                          I18N="In the in-game dialog" text="Back to menu" word_wrap="true"/>
 
         </buttonbar>
diff --git a/data/gui/press_a_key_dialog.stkgui b/data/gui/dialogs/press_a_key_dialog.stkgui
similarity index 100%
rename from data/gui/press_a_key_dialog.stkgui
rename to data/gui/dialogs/press_a_key_dialog.stkgui
diff --git a/data/gui/race_paused_dialog.stkgui b/data/gui/dialogs/race_paused_dialog.stkgui
similarity index 85%
rename from data/gui/race_paused_dialog.stkgui
rename to data/gui/dialogs/race_paused_dialog.stkgui
index cf19918b5..2f844c380 100644
--- a/data/gui/race_paused_dialog.stkgui
+++ b/data/gui/dialogs/race_paused_dialog.stkgui
@@ -5,29 +5,29 @@
 
         <!-- FIXME: some play in proportions occur below because the text of an icon
                     button is added UNDER it and not within its allocated height -->
-        <icon-button id="backbtn" align="center" icon="gui/back.png" extend_label="200"
+        <icon-button id="backbtn" align="center" icon="gui/icons/back.png" extend_label="200"
                      I18N="Race paused button" text="Back to Race" proportion="3"/>
 
         <spacer width="20" height="50" />
 
         <buttonbar id="choiceribbon" proportion="4" width="100%" align="center">
 
-            <icon-button id="newrace" width="128" height="128" icon="gui/main_race.png"
+            <icon-button id="newrace" width="128" height="128" icon="gui/icons/main_race.png"
                     I18N="Race paused button" text="Setup New Race" word_wrap="true"/>
 
-            <icon-button id="restart" width="128" height="128" icon="gui/restart.png"
+            <icon-button id="restart" width="128" height="128" icon="gui/icons/restart.png"
                     I18N="Race paused button" text="Restart Race" word_wrap="true"/>
 
-            <icon-button id="endrace" width="128" height="128" icon="gui/race_giveup.png"
+            <icon-button id="endrace" width="128" height="128" icon="gui/icons/race_giveup.png"
                          I18N="Race paused button" text="Give Up Race" word_wrap="true"/>
 
-            <icon-button id="options" width="128" height="128" icon="gui/main_options.png"
+            <icon-button id="options" width="128" height="128" icon="gui/icons/main_options.png"
                          I18N="Race paused button" text="Options" word_wrap="true"/>
 
-            <icon-button id="help" width="128" height="128" icon="gui/main_help.png"
+            <icon-button id="help" width="128" height="128" icon="gui/icons/main_help.png"
                     I18N="Race paused button" text="Help" word_wrap="true"/>
 
-            <icon-button id="exit" width="128" height="128" icon="gui/main_quit.png"
+            <icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
                          I18N="Race paused button" text="Exit Race" word_wrap="true"/>
 
         </buttonbar>
diff --git a/data/gui/select_challenge.stkgui b/data/gui/dialogs/select_challenge.stkgui
similarity index 85%
rename from data/gui/select_challenge.stkgui
rename to data/gui/dialogs/select_challenge.stkgui
index 02ab05b65..c11716c1f 100644
--- a/data/gui/select_challenge.stkgui
+++ b/data/gui/dialogs/select_challenge.stkgui
@@ -15,7 +15,7 @@
         <spacer height="2%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="novice" icon="gui/difficulty_easy.png"
+            <icon-button id="novice" icon="gui/icons/difficulty_easy.png"
                     I18N="Difficulty" text="Novice" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="novice_label" proportion="1" height="100%"/>
@@ -24,7 +24,7 @@
         <spacer height="6%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="intermediate" icon="gui/difficulty_medium.png"
+            <icon-button id="intermediate" icon="gui/icons/difficulty_medium.png"
                     I18N="Difficulty" text="Intermediate" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="intermediate_label" proportion="1" height="100%"/>
@@ -33,7 +33,7 @@
         <spacer height="6%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="expert" icon="gui/difficulty_hard.png"
+            <icon-button id="expert" icon="gui/icons/difficulty_hard.png"
                     I18N="Difficulty" text="Expert" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="difficult_label" proportion="1" height="100%"/>
@@ -42,7 +42,7 @@
         <spacer height="6%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="supertux" icon="gui/difficulty_best.png"
+            <icon-button id="supertux" icon="gui/icons/difficulty_best.png"
                     I18N="Difficulty" text="SuperTux" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="supertux_label" proportion="1" height="100%"/>
diff --git a/data/gui/select_challenge_nobest.stkgui b/data/gui/dialogs/select_challenge_nobest.stkgui
similarity index 86%
rename from data/gui/select_challenge_nobest.stkgui
rename to data/gui/dialogs/select_challenge_nobest.stkgui
index a63e32ed6..d7fd4faa9 100644
--- a/data/gui/select_challenge_nobest.stkgui
+++ b/data/gui/dialogs/select_challenge_nobest.stkgui
@@ -15,7 +15,7 @@
         <spacer height="2%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="novice" icon="gui/difficulty_easy.png"
+            <icon-button id="novice" icon="gui/icons/difficulty_easy.png"
                     I18N="Difficulty" text="Novice" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="novice_label" proportion="1" height="100%"/>
@@ -24,7 +24,7 @@
         <spacer height="8%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="intermediate" icon="gui/difficulty_medium.png"
+            <icon-button id="intermediate" icon="gui/icons/difficulty_medium.png"
                     I18N="Difficulty" text="Intermediate" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="intermediate_label" proportion="1" height="100%"/>
@@ -33,7 +33,7 @@
         <spacer height="8%" width="1"/>
 
         <div width="100%" proportion="1" layout="horizontal-row">
-            <icon-button id="expert" icon="gui/difficulty_hard.png"
+            <icon-button id="expert" icon="gui/icons/difficulty_hard.png"
                     I18N="Difficulty" text="Expert" height="100%"/>
             <spacer width="5%" height="1"/>
             <label id="difficult_label" proportion="1" height="100%"/>
diff --git a/data/gui/tutorial_message_dialog.stkgui b/data/gui/dialogs/tutorial_message_dialog.stkgui
similarity index 100%
rename from data/gui/tutorial_message_dialog.stkgui
rename to data/gui/dialogs/tutorial_message_dialog.stkgui
diff --git a/data/gui/License.txt b/data/gui/icons/License.txt
similarity index 100%
rename from data/gui/License.txt
rename to data/gui/icons/License.txt
diff --git a/data/gui/addons.png b/data/gui/icons/addons.png
similarity index 100%
rename from data/gui/addons.png
rename to data/gui/icons/addons.png
diff --git a/data/gui/android/blur_bg_button.png b/data/gui/icons/android/blur_bg_button.png
similarity index 100%
rename from data/gui/android/blur_bg_button.png
rename to data/gui/icons/android/blur_bg_button.png
diff --git a/data/gui/android/blur_bg_button_focus.png b/data/gui/icons/android/blur_bg_button_focus.png
similarity index 100%
rename from data/gui/android/blur_bg_button_focus.png
rename to data/gui/icons/android/blur_bg_button_focus.png
diff --git a/data/gui/android/drift.png b/data/gui/icons/android/drift.png
similarity index 100%
rename from data/gui/android/drift.png
rename to data/gui/icons/android/drift.png
diff --git a/data/gui/android/license.txt b/data/gui/icons/android/license.txt
similarity index 100%
rename from data/gui/android/license.txt
rename to data/gui/icons/android/license.txt
diff --git a/data/gui/android/nitro.png b/data/gui/icons/android/nitro.png
similarity index 100%
rename from data/gui/android/nitro.png
rename to data/gui/icons/android/nitro.png
diff --git a/data/gui/android/nitro_empty.png b/data/gui/icons/android/nitro_empty.png
similarity index 100%
rename from data/gui/android/nitro_empty.png
rename to data/gui/icons/android/nitro_empty.png
diff --git a/data/gui/android/pause.png b/data/gui/icons/android/pause.png
similarity index 100%
rename from data/gui/android/pause.png
rename to data/gui/icons/android/pause.png
diff --git a/data/gui/android/steering_wheel.png b/data/gui/icons/android/steering_wheel.png
similarity index 100%
rename from data/gui/android/steering_wheel.png
rename to data/gui/icons/android/steering_wheel.png
diff --git a/data/gui/android/thunderbird_reset.png b/data/gui/icons/android/thunderbird_reset.png
similarity index 100%
rename from data/gui/android/thunderbird_reset.png
rename to data/gui/icons/android/thunderbird_reset.png
diff --git a/data/gui/android/up_down.png b/data/gui/icons/android/up_down.png
similarity index 100%
rename from data/gui/android/up_down.png
rename to data/gui/icons/android/up_down.png
diff --git a/data/gui/android/wing_mirror.png b/data/gui/icons/android/wing_mirror.png
similarity index 100%
rename from data/gui/android/wing_mirror.png
rename to data/gui/icons/android/wing_mirror.png
diff --git a/data/gui/back.png b/data/gui/icons/back.png
similarity index 100%
rename from data/gui/back.png
rename to data/gui/icons/back.png
diff --git a/data/gui/banana.png b/data/gui/icons/banana.png
similarity index 100%
rename from data/gui/banana.png
rename to data/gui/icons/banana.png
diff --git a/data/gui/blue_arrow.png b/data/gui/icons/blue_arrow.png
similarity index 100%
rename from data/gui/blue_arrow.png
rename to data/gui/icons/blue_arrow.png
diff --git a/data/gui/blue_flag.png b/data/gui/icons/blue_flag.png
similarity index 100%
rename from data/gui/blue_flag.png
rename to data/gui/icons/blue_flag.png
diff --git a/data/gui/blue_plus.png b/data/gui/icons/blue_plus.png
similarity index 100%
rename from data/gui/blue_plus.png
rename to data/gui/icons/blue_plus.png
diff --git a/data/gui/bomb_icon.png b/data/gui/icons/bomb_icon.png
similarity index 100%
rename from data/gui/bomb_icon.png
rename to data/gui/icons/bomb_icon.png
diff --git a/data/gui/challenge.png b/data/gui/icons/challenge.png
similarity index 100%
rename from data/gui/challenge.png
rename to data/gui/icons/challenge.png
diff --git a/data/gui/crown.png b/data/gui/icons/crown.png
similarity index 100%
rename from data/gui/crown.png
rename to data/gui/icons/crown.png
diff --git a/data/gui/cup_bronze.png b/data/gui/icons/cup_bronze.png
similarity index 100%
rename from data/gui/cup_bronze.png
rename to data/gui/icons/cup_bronze.png
diff --git a/data/gui/cup_gold.png b/data/gui/icons/cup_gold.png
similarity index 100%
rename from data/gui/cup_gold.png
rename to data/gui/icons/cup_gold.png
diff --git a/data/gui/cup_platinum.png b/data/gui/icons/cup_platinum.png
similarity index 100%
rename from data/gui/cup_platinum.png
rename to data/gui/icons/cup_platinum.png
diff --git a/data/gui/cup_silver.png b/data/gui/icons/cup_silver.png
similarity index 100%
rename from data/gui/cup_silver.png
rename to data/gui/icons/cup_silver.png
diff --git a/data/gui/difficulty_best.png b/data/gui/icons/difficulty_best.png
similarity index 100%
rename from data/gui/difficulty_best.png
rename to data/gui/icons/difficulty_best.png
diff --git a/data/gui/difficulty_easy.png b/data/gui/icons/difficulty_easy.png
similarity index 100%
rename from data/gui/difficulty_easy.png
rename to data/gui/icons/difficulty_easy.png
diff --git a/data/gui/difficulty_hard.png b/data/gui/icons/difficulty_hard.png
similarity index 100%
rename from data/gui/difficulty_hard.png
rename to data/gui/icons/difficulty_hard.png
diff --git a/data/gui/difficulty_medium.png b/data/gui/icons/difficulty_medium.png
similarity index 100%
rename from data/gui/difficulty_medium.png
rename to data/gui/icons/difficulty_medium.png
diff --git a/data/gui/down.png b/data/gui/icons/down.png
similarity index 100%
rename from data/gui/down.png
rename to data/gui/icons/down.png
diff --git a/data/gui/dropdown.png b/data/gui/icons/dropdown.png
similarity index 100%
rename from data/gui/dropdown.png
rename to data/gui/icons/dropdown.png
diff --git a/data/gui/edit.png b/data/gui/icons/edit.png
similarity index 100%
rename from data/gui/edit.png
rename to data/gui/icons/edit.png
diff --git a/data/gui/gamepad.png b/data/gui/icons/gamepad.png
similarity index 100%
rename from data/gui/gamepad.png
rename to data/gui/icons/gamepad.png
diff --git a/data/gui/gamepad_off.png b/data/gui/icons/gamepad_off.png
similarity index 100%
rename from data/gui/gamepad_off.png
rename to data/gui/icons/gamepad_off.png
diff --git a/data/gui/gauge_empty.png b/data/gui/icons/gauge_empty.png
similarity index 100%
rename from data/gui/gauge_empty.png
rename to data/gui/icons/gauge_empty.png
diff --git a/data/gui/gauge_full.png b/data/gui/icons/gauge_full.png
similarity index 100%
rename from data/gui/gauge_full.png
rename to data/gui/icons/gauge_full.png
diff --git a/data/gui/gauge_full_bright.png b/data/gui/icons/gauge_full_bright.png
similarity index 100%
rename from data/gui/gauge_full_bright.png
rename to data/gui/icons/gauge_full_bright.png
diff --git a/data/gui/gauge_goal.png b/data/gui/icons/gauge_goal.png
similarity index 100%
rename from data/gui/gauge_goal.png
rename to data/gui/icons/gauge_goal.png
diff --git a/data/gui/ghost_plus.png b/data/gui/icons/ghost_plus.png
similarity index 100%
rename from data/gui/ghost_plus.png
rename to data/gui/icons/ghost_plus.png
diff --git a/data/gui/gift.png b/data/gui/icons/gift.png
similarity index 100%
rename from data/gui/gift.png
rename to data/gui/icons/gift.png
diff --git a/data/gui/gp_copy.png b/data/gui/icons/gp_copy.png
similarity index 100%
rename from data/gui/gp_copy.png
rename to data/gui/icons/gp_copy.png
diff --git a/data/gui/gp_edit.png b/data/gui/icons/gp_edit.png
similarity index 100%
rename from data/gui/gp_edit.png
rename to data/gui/icons/gp_edit.png
diff --git a/data/gui/gp_new.png b/data/gui/icons/gp_new.png
similarity index 100%
rename from data/gui/gp_new.png
rename to data/gui/icons/gp_new.png
diff --git a/data/gui/gp_remove.png b/data/gui/icons/gp_remove.png
similarity index 100%
rename from data/gui/gp_remove.png
rename to data/gui/icons/gp_remove.png
diff --git a/data/gui/gpeditor.png b/data/gui/icons/gpeditor.png
similarity index 100%
rename from data/gui/gpeditor.png
rename to data/gui/icons/gpeditor.png
diff --git a/data/gui/green_check.png b/data/gui/icons/green_check.png
similarity index 100%
rename from data/gui/green_check.png
rename to data/gui/icons/green_check.png
diff --git a/data/gui/gui_lock.png b/data/gui/icons/gui_lock.png
similarity index 100%
rename from data/gui/gui_lock.png
rename to data/gui/icons/gui_lock.png
diff --git a/data/gui/heart.png b/data/gui/icons/heart.png
similarity index 100%
rename from data/gui/heart.png
rename to data/gui/icons/heart.png
diff --git a/data/gui/hourglass.png b/data/gui/icons/hourglass.png
similarity index 100%
rename from data/gui/hourglass.png
rename to data/gui/icons/hourglass.png
diff --git a/data/gui/icons-frame.png b/data/gui/icons/icons-frame.png
similarity index 100%
rename from data/gui/icons-frame.png
rename to data/gui/icons/icons-frame.png
diff --git a/data/gui/karts.png b/data/gui/icons/karts.png
similarity index 100%
rename from data/gui/karts.png
rename to data/gui/icons/karts.png
diff --git a/data/gui/keyboard.png b/data/gui/icons/keyboard.png
similarity index 100%
rename from data/gui/keyboard.png
rename to data/gui/icons/keyboard.png
diff --git a/data/gui/loading.png b/data/gui/icons/loading.png
similarity index 100%
rename from data/gui/loading.png
rename to data/gui/icons/loading.png
diff --git a/data/gui/logo.png b/data/gui/icons/logo.png
similarity index 100%
rename from data/gui/logo.png
rename to data/gui/icons/logo.png
diff --git a/data/gui/logo_slim.png b/data/gui/icons/logo_slim.png
similarity index 100%
rename from data/gui/logo_slim.png
rename to data/gui/icons/logo_slim.png
diff --git a/data/gui/main_about.png b/data/gui/icons/main_about.png
similarity index 100%
rename from data/gui/main_about.png
rename to data/gui/icons/main_about.png
diff --git a/data/gui/main_help.png b/data/gui/icons/main_help.png
similarity index 100%
rename from data/gui/main_help.png
rename to data/gui/icons/main_help.png
diff --git a/data/gui/main_network.png b/data/gui/icons/main_network.png
similarity index 100%
rename from data/gui/main_network.png
rename to data/gui/icons/main_network.png
diff --git a/data/gui/main_options.png b/data/gui/icons/main_options.png
similarity index 100%
rename from data/gui/main_options.png
rename to data/gui/icons/main_options.png
diff --git a/data/gui/main_quit.png b/data/gui/icons/main_quit.png
similarity index 100%
rename from data/gui/main_quit.png
rename to data/gui/icons/main_quit.png
diff --git a/data/gui/main_race.png b/data/gui/icons/main_race.png
similarity index 100%
rename from data/gui/main_race.png
rename to data/gui/icons/main_race.png
diff --git a/data/gui/main_race_multi.png b/data/gui/icons/main_race_multi.png
similarity index 100%
rename from data/gui/main_race_multi.png
rename to data/gui/icons/main_race_multi.png
diff --git a/data/gui/mass.png b/data/gui/icons/mass.png
similarity index 100%
rename from data/gui/mass.png
rename to data/gui/icons/mass.png
diff --git a/data/gui/materials.xml b/data/gui/icons/materials.xml
similarity index 100%
rename from data/gui/materials.xml
rename to data/gui/icons/materials.xml
diff --git a/data/gui/menu_addons.png b/data/gui/icons/menu_addons.png
similarity index 100%
rename from data/gui/menu_addons.png
rename to data/gui/icons/menu_addons.png
diff --git a/data/gui/menu_addons_focus.png b/data/gui/icons/menu_addons_focus.png
similarity index 100%
rename from data/gui/menu_addons_focus.png
rename to data/gui/icons/menu_addons_focus.png
diff --git a/data/gui/menu_multi.png b/data/gui/icons/menu_multi.png
similarity index 100%
rename from data/gui/menu_multi.png
rename to data/gui/icons/menu_multi.png
diff --git a/data/gui/menu_multi_focus.png b/data/gui/icons/menu_multi_focus.png
similarity index 100%
rename from data/gui/menu_multi_focus.png
rename to data/gui/icons/menu_multi_focus.png
diff --git a/data/gui/menu_online.png b/data/gui/icons/menu_online.png
similarity index 100%
rename from data/gui/menu_online.png
rename to data/gui/icons/menu_online.png
diff --git a/data/gui/menu_online_focus.png b/data/gui/icons/menu_online_focus.png
similarity index 100%
rename from data/gui/menu_online_focus.png
rename to data/gui/icons/menu_online_focus.png
diff --git a/data/gui/menu_race.png b/data/gui/icons/menu_race.png
similarity index 100%
rename from data/gui/menu_race.png
rename to data/gui/icons/menu_race.png
diff --git a/data/gui/menu_race_focus.png b/data/gui/icons/menu_race_focus.png
similarity index 100%
rename from data/gui/menu_race_focus.png
rename to data/gui/icons/menu_race_focus.png
diff --git a/data/gui/menu_story.png b/data/gui/icons/menu_story.png
similarity index 100%
rename from data/gui/menu_story.png
rename to data/gui/icons/menu_story.png
diff --git a/data/gui/menu_story_focus.png b/data/gui/icons/menu_story_focus.png
similarity index 100%
rename from data/gui/menu_story_focus.png
rename to data/gui/icons/menu_story_focus.png
diff --git a/data/gui/mode_3strikes.png b/data/gui/icons/mode_3strikes.png
similarity index 100%
rename from data/gui/mode_3strikes.png
rename to data/gui/icons/mode_3strikes.png
diff --git a/data/gui/mode_easter.png b/data/gui/icons/mode_easter.png
similarity index 100%
rename from data/gui/mode_easter.png
rename to data/gui/icons/mode_easter.png
diff --git a/data/gui/mode_ftl.png b/data/gui/icons/mode_ftl.png
similarity index 100%
rename from data/gui/mode_ftl.png
rename to data/gui/icons/mode_ftl.png
diff --git a/data/gui/mode_ghost.png b/data/gui/icons/mode_ghost.png
similarity index 100%
rename from data/gui/mode_ghost.png
rename to data/gui/icons/mode_ghost.png
diff --git a/data/gui/mode_normal.png b/data/gui/icons/mode_normal.png
similarity index 100%
rename from data/gui/mode_normal.png
rename to data/gui/icons/mode_normal.png
diff --git a/data/gui/mode_soccer.png b/data/gui/icons/mode_soccer.png
similarity index 100%
rename from data/gui/mode_soccer.png
rename to data/gui/icons/mode_soccer.png
diff --git a/data/gui/mode_tt.png b/data/gui/icons/mode_tt.png
similarity index 100%
rename from data/gui/mode_tt.png
rename to data/gui/icons/mode_tt.png
diff --git a/data/gui/mystery_unlock.png b/data/gui/icons/mystery_unlock.png
similarity index 100%
rename from data/gui/mystery_unlock.png
rename to data/gui/icons/mystery_unlock.png
diff --git a/data/gui/networking_icon.png b/data/gui/icons/networking_icon.png
similarity index 100%
rename from data/gui/networking_icon.png
rename to data/gui/icons/networking_icon.png
diff --git a/data/gui/nitro.png b/data/gui/icons/nitro.png
similarity index 100%
rename from data/gui/nitro.png
rename to data/gui/icons/nitro.png
diff --git a/data/gui/no-package-featured.png b/data/gui/icons/no-package-featured.png
similarity index 100%
rename from data/gui/no-package-featured.png
rename to data/gui/icons/no-package-featured.png
diff --git a/data/gui/no-package.png b/data/gui/icons/no-package.png
similarity index 100%
rename from data/gui/no-package.png
rename to data/gui/icons/no-package.png
diff --git a/data/gui/notes.png b/data/gui/icons/notes.png
similarity index 100%
rename from data/gui/notes.png
rename to data/gui/icons/notes.png
diff --git a/data/gui/online/menu_create_server.png b/data/gui/icons/online/menu_create_server.png
similarity index 100%
rename from data/gui/online/menu_create_server.png
rename to data/gui/icons/online/menu_create_server.png
diff --git a/data/gui/online/menu_create_server_hover.png b/data/gui/icons/online/menu_create_server_hover.png
similarity index 100%
rename from data/gui/online/menu_create_server_hover.png
rename to data/gui/icons/online/menu_create_server_hover.png
diff --git a/data/gui/online/menu_find_server.png b/data/gui/icons/online/menu_find_server.png
similarity index 100%
rename from data/gui/online/menu_find_server.png
rename to data/gui/icons/online/menu_find_server.png
diff --git a/data/gui/online/menu_find_server_hover.png b/data/gui/icons/online/menu_find_server_hover.png
similarity index 100%
rename from data/gui/online/menu_find_server_hover.png
rename to data/gui/icons/online/menu_find_server_hover.png
diff --git a/data/gui/online/menu_quick_play.png b/data/gui/icons/online/menu_quick_play.png
similarity index 100%
rename from data/gui/online/menu_quick_play.png
rename to data/gui/icons/online/menu_quick_play.png
diff --git a/data/gui/online/menu_quick_play_hover.png b/data/gui/icons/online/menu_quick_play_hover.png
similarity index 100%
rename from data/gui/online/menu_quick_play_hover.png
rename to data/gui/icons/online/menu_quick_play_hover.png
diff --git a/data/gui/options_audio.png b/data/gui/icons/options_audio.png
similarity index 100%
rename from data/gui/options_audio.png
rename to data/gui/icons/options_audio.png
diff --git a/data/gui/options_input.png b/data/gui/icons/options_input.png
similarity index 100%
rename from data/gui/options_input.png
rename to data/gui/icons/options_input.png
diff --git a/data/gui/options_language.png b/data/gui/icons/options_language.png
similarity index 100%
rename from data/gui/options_language.png
rename to data/gui/icons/options_language.png
diff --git a/data/gui/options_players.png b/data/gui/icons/options_players.png
similarity index 100%
rename from data/gui/options_players.png
rename to data/gui/icons/options_players.png
diff --git a/data/gui/options_ui.png b/data/gui/icons/options_ui.png
similarity index 100%
rename from data/gui/options_ui.png
rename to data/gui/icons/options_ui.png
diff --git a/data/gui/options_video.png b/data/gui/icons/options_video.png
similarity index 100%
rename from data/gui/options_video.png
rename to data/gui/icons/options_video.png
diff --git a/data/gui/package-featured.png b/data/gui/icons/package-featured.png
similarity index 100%
rename from data/gui/package-featured.png
rename to data/gui/icons/package-featured.png
diff --git a/data/gui/package-uninstall.png b/data/gui/icons/package-uninstall.png
similarity index 100%
rename from data/gui/package-uninstall.png
rename to data/gui/icons/package-uninstall.png
diff --git a/data/gui/package-update.png b/data/gui/icons/package-update.png
similarity index 100%
rename from data/gui/package-update.png
rename to data/gui/icons/package-update.png
diff --git a/data/gui/package.png b/data/gui/icons/package.png
similarity index 100%
rename from data/gui/package.png
rename to data/gui/icons/package.png
diff --git a/data/gui/power.png b/data/gui/icons/power.png
similarity index 100%
rename from data/gui/power.png
rename to data/gui/icons/power.png
diff --git a/data/gui/race_giveup.png b/data/gui/icons/race_giveup.png
similarity index 100%
rename from data/gui/race_giveup.png
rename to data/gui/icons/race_giveup.png
diff --git a/data/gui/random_kart.png b/data/gui/icons/random_kart.png
similarity index 100%
rename from data/gui/random_kart.png
rename to data/gui/icons/random_kart.png
diff --git a/data/gui/red_arrow.png b/data/gui/icons/red_arrow.png
similarity index 100%
rename from data/gui/red_arrow.png
rename to data/gui/icons/red_arrow.png
diff --git a/data/gui/red_flag.png b/data/gui/icons/red_flag.png
similarity index 100%
rename from data/gui/red_flag.png
rename to data/gui/icons/red_flag.png
diff --git a/data/gui/red_mark.png b/data/gui/icons/red_mark.png
similarity index 100%
rename from data/gui/red_mark.png
rename to data/gui/icons/red_mark.png
diff --git a/data/gui/remove.png b/data/gui/icons/remove.png
similarity index 100%
rename from data/gui/remove.png
rename to data/gui/icons/remove.png
diff --git a/data/gui/rename.png b/data/gui/icons/rename.png
similarity index 100%
rename from data/gui/rename.png
rename to data/gui/icons/rename.png
diff --git a/data/gui/restart.png b/data/gui/icons/restart.png
similarity index 100%
rename from data/gui/restart.png
rename to data/gui/icons/restart.png
diff --git a/data/gui/save.png b/data/gui/icons/save.png
similarity index 100%
rename from data/gui/save.png
rename to data/gui/icons/save.png
diff --git a/data/gui/screen1610.png b/data/gui/icons/screen1610.png
similarity index 100%
rename from data/gui/screen1610.png
rename to data/gui/icons/screen1610.png
diff --git a/data/gui/screen169.png b/data/gui/icons/screen169.png
similarity index 100%
rename from data/gui/screen169.png
rename to data/gui/icons/screen169.png
diff --git a/data/gui/screen32.png b/data/gui/icons/screen32.png
similarity index 100%
rename from data/gui/screen32.png
rename to data/gui/icons/screen32.png
diff --git a/data/gui/screen43.png b/data/gui/icons/screen43.png
similarity index 100%
rename from data/gui/screen43.png
rename to data/gui/icons/screen43.png
diff --git a/data/gui/screen53.png b/data/gui/icons/screen53.png
similarity index 100%
rename from data/gui/screen53.png
rename to data/gui/icons/screen53.png
diff --git a/data/gui/screen54.png b/data/gui/icons/screen54.png
similarity index 100%
rename from data/gui/screen54.png
rename to data/gui/icons/screen54.png
diff --git a/data/gui/screen_other.png b/data/gui/icons/screen_other.png
similarity index 100%
rename from data/gui/screen_other.png
rename to data/gui/icons/screen_other.png
diff --git a/data/gui/scroll_down.png b/data/gui/icons/scroll_down.png
similarity index 100%
rename from data/gui/scroll_down.png
rename to data/gui/icons/scroll_down.png
diff --git a/data/gui/scroll_up.png b/data/gui/icons/scroll_up.png
similarity index 100%
rename from data/gui/scroll_up.png
rename to data/gui/icons/scroll_up.png
diff --git a/data/gui/search.png b/data/gui/icons/search.png
similarity index 100%
rename from data/gui/search.png
rename to data/gui/icons/search.png
diff --git a/data/gui/slipstream_icon.png b/data/gui/icons/slipstream_icon.png
similarity index 100%
rename from data/gui/slipstream_icon.png
rename to data/gui/icons/slipstream_icon.png
diff --git a/data/gui/soccer_ball_blue.png b/data/gui/icons/soccer_ball_blue.png
similarity index 100%
rename from data/gui/soccer_ball_blue.png
rename to data/gui/icons/soccer_ball_blue.png
diff --git a/data/gui/soccer_ball_normal.png b/data/gui/icons/soccer_ball_normal.png
similarity index 100%
rename from data/gui/soccer_ball_normal.png
rename to data/gui/icons/soccer_ball_normal.png
diff --git a/data/gui/soccer_ball_red.png b/data/gui/icons/soccer_ball_red.png
similarity index 100%
rename from data/gui/soccer_ball_red.png
rename to data/gui/icons/soccer_ball_red.png
diff --git a/data/gui/speed.png b/data/gui/icons/speed.png
similarity index 100%
rename from data/gui/speed.png
rename to data/gui/icons/speed.png
diff --git a/data/gui/speedback.png b/data/gui/icons/speedback.png
similarity index 100%
rename from data/gui/speedback.png
rename to data/gui/icons/speedback.png
diff --git a/data/gui/speedfore.png b/data/gui/icons/speedfore.png
similarity index 100%
rename from data/gui/speedfore.png
rename to data/gui/icons/speedfore.png
diff --git a/data/gui/story_mode_book.png b/data/gui/icons/story_mode_book.png
similarity index 100%
rename from data/gui/story_mode_book.png
rename to data/gui/icons/story_mode_book.png
diff --git a/data/gui/top_bar.png b/data/gui/icons/top_bar.png
similarity index 100%
rename from data/gui/top_bar.png
rename to data/gui/icons/top_bar.png
diff --git a/data/gui/track_random.png b/data/gui/icons/track_random.png
similarity index 100%
rename from data/gui/track_random.png
rename to data/gui/icons/track_random.png
diff --git a/data/gui/tutorial.png b/data/gui/icons/tutorial.png
similarity index 100%
rename from data/gui/tutorial.png
rename to data/gui/icons/tutorial.png
diff --git a/data/gui/up.png b/data/gui/icons/up.png
similarity index 100%
rename from data/gui/up.png
rename to data/gui/icons/up.png
diff --git a/data/gui/weapons.png b/data/gui/icons/weapons.png
similarity index 100%
rename from data/gui/weapons.png
rename to data/gui/icons/weapons.png
diff --git a/data/gui/addons_screen.stkgui b/data/gui/screens/addons_screen.stkgui
similarity index 88%
rename from data/gui/addons_screen.stkgui
rename to data/gui/screens/addons_screen.stkgui
index bd6f506db..8ad9bb2f2 100644
--- a/data/gui/addons_screen.stkgui
+++ b/data/gui/screens/addons_screen.stkgui
@@ -2,9 +2,9 @@
 <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/back.png"/>
+            <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/restart.png"/>
+            <icon-button id="reload"   height="90%" icon="gui/icons/restart.png"/>
         </div>
 
         <box id="filter_box" width="97%" height="75" layout="vertical-row" align="center">
@@ -18,18 +18,18 @@
                 <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only items with good rating"/>
                 <spacer width="10" />
                 <spinner id="filter_rating" proportion="5" align="center" min_value="0" wrap_around="true"/>
-                <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
+                <icon-button id="filter_search" height="100%" icon="gui/icons/search.png"/>
             </div>
         </box>
 
         <spacer height="15" width="10"/>
 
         <tabs id="category" height="10%" max_height="110" width="90%" align="center">
-            <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
+            <icon-button id="tab_kart" width="128" height="128" icon="gui/icons/karts.png"
                     I18N="In the addons screen" text="Karts"/>
-            <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
+            <icon-button id="tab_track" width="128" height="128" icon="gui/icons/mode_normal.png"
                     I18N="In the addons screen" text="Tracks"/>
-            <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
+            <icon-button id="tab_arena" width="128" height="128" icon="gui/icons/mode_normal.png"
                     I18N="In the addons screen" text="Arenas"/>
         </tabs>
 
diff --git a/data/gui/arenas.stkgui b/data/gui/screens/arenas.stkgui
similarity index 92%
rename from data/gui/arenas.stkgui
rename to data/gui/screens/arenas.stkgui
index 7433acf35..6abf3ec6d 100644
--- a/data/gui/arenas.stkgui
+++ b/data/gui/screens/arenas.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
 
diff --git a/data/gui/credits.stkgui b/data/gui/screens/credits.stkgui
similarity index 84%
rename from data/gui/credits.stkgui
rename to data/gui/screens/credits.stkgui
index f3d6ce4c4..79e0fed76 100644
--- a/data/gui/credits.stkgui
+++ b/data/gui/screens/credits.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/back.png"/>
+    <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" >
 
-        <icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo_slim.png"/>
+        <icon id="logo" align="center" proportion="4" width="100%" icon="gui/icons/logo_slim.png"/>
 
         <div x="0" y="0" width="100%" proportion="1" layout="horizontal-row" >
 
diff --git a/data/gui/easter_egg.stkgui b/data/gui/screens/easter_egg.stkgui
similarity index 92%
rename from data/gui/easter_egg.stkgui
rename to data/gui/screens/easter_egg.stkgui
index 653bfd454..f5f873bc9 100644
--- a/data/gui/easter_egg.stkgui
+++ b/data/gui/screens/easter_egg.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
 
diff --git a/data/gui/edit_gp.stkgui b/data/gui/screens/edit_gp.stkgui
similarity index 86%
rename from data/gui/edit_gp.stkgui
rename to data/gui/screens/edit_gp.stkgui
index 12154180b..7f38c7176 100644
--- a/data/gui/edit_gp.stkgui
+++ b/data/gui/screens/edit_gp.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/back.png" />
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png" />
 
     <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row">
 
@@ -16,17 +16,17 @@
         <spacer width="100%" height="2%" />
 
         <buttonbar proportion="1" id="menu" height="135" width="100%" align="center">
-            <icon-button id="up" width="128" height="128" icon="gui/up.png"
+            <icon-button id="up" width="128" height="128" icon="gui/icons/up.png"
                 I18N="Menu item" text="Move up" />
-            <icon-button id="down" width="128" height="128" icon="gui/down.png"
+            <icon-button id="down" width="128" height="128" icon="gui/icons/down.png"
                 I18N="Menu item" text="Move down" />
-            <icon-button id="add" width="128" height="128" icon="gui/blue_plus.png"
+            <icon-button id="add" width="128" height="128" icon="gui/icons/blue_plus.png"
                 I18N="Menu item" text="Add" />
-            <icon-button id="edit" width="128" height="128" icon="gui/edit.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/icons/edit.png"
                 I18N="Menu item" text="Edit" />
-            <icon-button id="remove" width="128" height="128" icon="gui/remove.png"
+            <icon-button id="remove" width="128" height="128" icon="gui/icons/remove.png"
                 I18N="Menu item" text="Remove" />
-            <icon-button id="save" width="128" height="128" icon="gui/save.png"
+            <icon-button id="save" width="128" height="128" icon="gui/icons/save.png"
                 I18N="Menu item" text="Save" />
         </buttonbar>
     </div>
diff --git a/data/gui/edit_track.stkgui b/data/gui/screens/edit_track.stkgui
similarity index 100%
rename from data/gui/edit_track.stkgui
rename to data/gui/screens/edit_track.stkgui
diff --git a/data/gui/feature_unlocked.stkgui b/data/gui/screens/feature_unlocked.stkgui
similarity index 100%
rename from data/gui/feature_unlocked.stkgui
rename to data/gui/screens/feature_unlocked.stkgui
diff --git a/data/gui/ghost_replay_selection.stkgui b/data/gui/screens/ghost_replay_selection.stkgui
similarity index 93%
rename from data/gui/ghost_replay_selection.stkgui
rename to data/gui/screens/ghost_replay_selection.stkgui
index e16e1d255..3c6b4c713 100644
--- a/data/gui/ghost_replay_selection.stkgui
+++ b/data/gui/screens/ghost_replay_selection.stkgui
@@ -3,9 +3,9 @@
     <div x="0%" y="1%" 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/back.png"/>
+            <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/restart.png"/>
+            <icon-button id="reload" height="90%" icon="gui/icons/restart.png"/>
         </div>
 
         <!-- This is filled in programmatically -->
@@ -14,9 +14,9 @@
         </box>
 
         <tabs id="race_mode" height="6%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_time_trial" width="128" height="128" icon="gui/mode_tt.png"
+            <icon-button id="tab_time_trial" width="128" height="128" icon="gui/icons/mode_tt.png"
                          I18N="In the ghost replay selection screen" text="Time trial"/>
-            <icon-button id="tab_egg_hunt" width="128" height="128" icon="gui/mode_easter.png"
+            <icon-button id="tab_egg_hunt" width="128" height="128" icon="gui/icons/mode_easter.png"
                          I18N="In the ghost replay selection screen" text="Egg hunt"/>
         </tabs>
 
diff --git a/data/gui/gp_info.stkgui b/data/gui/screens/gp_info.stkgui
similarity index 95%
rename from data/gui/gp_info.stkgui
rename to data/gui/screens/gp_info.stkgui
index d0e7ec86a..6d5d80a3b 100644
--- a/data/gui/gp_info.stkgui
+++ b/data/gui/screens/gp_info.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/back.png"/>
+    <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 id="name" height="7%" width="80%" align="center" text_align="center"/>
@@ -53,10 +53,10 @@
         </box>
         <spacer width="1" height="1%"/>
         <buttonbar id="buttons" height="17%" width="100%" align="center">
-            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="start" width="64" height="64" icon="gui/icons/green_check.png"
                     I18N="In the grand prix info screen" text="Start Race"/>
 
-            <icon-button id="continue" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="continue" width="64" height="64" icon="gui/icons/green_check.png"
                     I18N="In the grand prix info screen" text="Continue saved GP"/>
         </buttonbar>
 
diff --git a/data/gui/grand_prix_editor.stkgui b/data/gui/screens/grand_prix_editor.stkgui
similarity index 90%
rename from data/gui/grand_prix_editor.stkgui
rename to data/gui/screens/grand_prix_editor.stkgui
index 71b72cc36..f93b221c1 100644
--- a/data/gui/grand_prix_editor.stkgui
+++ b/data/gui/screens/grand_prix_editor.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
 
@@ -30,15 +30,15 @@
         <spacer height="20" />
 
         <buttonbar proportion="3" id="menu" height="135" width="100%" align="center">
-            <icon-button id="new" width="128" height="128" icon="gui/gp_new.png"
+            <icon-button id="new" width="128" height="128" icon="gui/icons/gp_new.png"
                 I18N="Menu item" text="New" />
-            <icon-button id="copy" width="128" height="128" icon="gui/gp_copy.png"
+            <icon-button id="copy" width="128" height="128" icon="gui/icons/gp_copy.png"
                 I18N="Menu item" text="Copy" />
-            <icon-button id="edit" width="128" height="128" icon="gui/edit.png"
+            <icon-button id="edit" width="128" height="128" icon="gui/icons/edit.png"
                 I18N="Menu item" text="Edit" />
-            <icon-button id="remove" width="128" height="128" icon="gui/gp_remove.png"
+            <icon-button id="remove" width="128" height="128" icon="gui/icons/gp_remove.png"
                 I18N="Menu item" text="Remove" />
-            <icon-button id="rename" width="128" height="128" icon="gui/rename.png"
+            <icon-button id="rename" width="128" height="128" icon="gui/icons/rename.png"
                 I18N="Menu item" text="Rename" />
         </buttonbar>
 
diff --git a/data/gui/grand_prix_lose.stkgui b/data/gui/screens/grand_prix_lose.stkgui
similarity index 100%
rename from data/gui/grand_prix_lose.stkgui
rename to data/gui/screens/grand_prix_lose.stkgui
diff --git a/data/gui/grand_prix_win.stkgui b/data/gui/screens/grand_prix_win.stkgui
similarity index 100%
rename from data/gui/grand_prix_win.stkgui
rename to data/gui/screens/grand_prix_win.stkgui
diff --git a/data/gui/help1.stkgui b/data/gui/screens/help1.stkgui
similarity index 89%
rename from data/gui/help1.stkgui
rename to data/gui/screens/help1.stkgui
index 119c5b735..9598cfe85 100644
--- a/data/gui/help1.stkgui
+++ b/data/gui/screens/help1.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
@@ -30,19 +30,19 @@
 
                 <spacer width="5" height="1%"/>
                 <div width="50%" proportion="2" align="center" layout="horizontal-row">
-                    <icon id="tutorialIcon" width="64" height="64" align="center" icon="gui/tutorial.png"/>
+                    <icon id="tutorialIcon" width="64" height="64" align="center" icon="gui/icons/tutorial.png"/>
                     <button id="startTutorial" align="center" text="Start the tutorial"/>
                 </div>
                 <spacer width="5" height="1%"/>
 
                 <div width="100%" proportion="5" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/gift.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/gift.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="7" height="100%" word_wrap="true"
                             I18N="In the help menu"
                             text="Collect blue gift boxes, they will give you powerups."/>
                     <spacer width="25" height="25"/>
-                    <icon align="center" width="64" height="64" icon="gui/banana.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/banana.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="3" height="100%" word_wrap="true"
                             I18N="In the help menu"
@@ -50,7 +50,7 @@
                 </div>
 
                 <div width="100%" proportion="6" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/nitro.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/nitro.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="3" height="100%" word_wrap="true"
                             I18N="In the help menu"
@@ -58,7 +58,7 @@
                     </div>
 
                 <div width="100%" proportion="4" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/gui_lock.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/gui_lock.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="2" height="100%" word_wrap="true"
                             I18N="In the help menu"
@@ -66,7 +66,7 @@
                 </div>
 
                 <div width="100%" proportion="6" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/android/drift.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/android/drift.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="2" height="100%" word_wrap="true"
                             I18N="In the help menu"
diff --git a/data/gui/help2.stkgui b/data/gui/screens/help2.stkgui
similarity index 91%
rename from data/gui/help2.stkgui
rename to data/gui/screens/help2.stkgui
index 27753d950..38066f650 100644
--- a/data/gui/help2.stkgui
+++ b/data/gui/screens/help2.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
@@ -32,7 +32,7 @@
                 <spacer height="2%" width="10"/>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mode_normal.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_normal.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -40,7 +40,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mode_tt.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_tt.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -48,7 +48,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mode_ftl.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_ftl.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -56,7 +56,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/weapons.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/weapons.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -64,7 +64,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mode_soccer.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_soccer.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -72,14 +72,14 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mode_easter.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_easter.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
                             text="Egg hunt: Explore tracks to find all hidden eggs."/>
                 </div>
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mode_ghost.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mode_ghost.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
diff --git a/data/gui/help3.stkgui b/data/gui/screens/help3.stkgui
similarity index 94%
rename from data/gui/help3.stkgui
rename to data/gui/screens/help3.stkgui
index 29cbdffbf..ae7fdcf34 100644
--- a/data/gui/help3.stkgui
+++ b/data/gui/screens/help3.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
diff --git a/data/gui/help4.stkgui b/data/gui/screens/help4.stkgui
similarity index 90%
rename from data/gui/help4.stkgui
rename to data/gui/screens/help4.stkgui
index 536c0a14d..a13381958 100644
--- a/data/gui/help4.stkgui
+++ b/data/gui/screens/help4.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
@@ -48,7 +48,7 @@
                 </div>
                 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/bomb_icon.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/bomb_icon.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
diff --git a/data/gui/help5.stkgui b/data/gui/screens/help5.stkgui
similarity index 89%
rename from data/gui/help5.stkgui
rename to data/gui/screens/help5.stkgui
index 6286df924..ac95c5ef7 100644
--- a/data/gui/help5.stkgui
+++ b/data/gui/screens/help5.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
@@ -32,7 +32,7 @@
                 <spacer height="2%" width="10"/>
                 
                 <div width="100%" proportion="5" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/challenge.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/challenge.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -40,7 +40,7 @@
                 </div>
                 
                 <div width="100%" proportion="4" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/cup_gold.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/cup_gold.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -48,7 +48,7 @@
                 </div>
                 
                 <div width="100%" proportion="3" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mystery_unlock.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mystery_unlock.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
diff --git a/data/gui/help6.stkgui b/data/gui/screens/help6.stkgui
similarity index 90%
rename from data/gui/help6.stkgui
rename to data/gui/screens/help6.stkgui
index 6ff99a813..4f9220e1e 100644
--- a/data/gui/help6.stkgui
+++ b/data/gui/screens/help6.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
@@ -32,7 +32,7 @@
                 <spacer height="2%" width="10"/>                
 
                 <div width="100%" proportion="4" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/mass.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/mass.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -40,7 +40,7 @@
                 </div>
                 
                 <div width="100%" proportion="4" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/power.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/power.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -48,7 +48,7 @@
                 </div>
                 
                 <div width="100%" proportion="4" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/speed.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/speed.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -56,7 +56,7 @@
                 </div>
 
                 <div width="100%" proportion="3" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/nitro.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/nitro.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -64,7 +64,7 @@
                 </div>
 
                 <div width="100%" proportion="4" layout="horizontal-row">
-                    <icon align="center" width="128" height="128" icon="gui/slipstream_icon.png"/>
+                    <icon align="center" width="128" height="128" icon="gui/icons/slipstream_icon.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%" word_wrap="true"
                             I18N="In the help menu"
diff --git a/data/gui/help7.stkgui b/data/gui/screens/help7.stkgui
similarity index 91%
rename from data/gui/help7.stkgui
rename to data/gui/screens/help7.stkgui
index ec5cf5624..d55213a90 100644
--- a/data/gui/help7.stkgui
+++ b/data/gui/screens/help7.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer height="1%" width="100%"/>
@@ -8,19 +8,19 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="category" height="100%" width="18%">
-                <icon-button id="page1" width="128" height="128" icon="gui/track_random.png"
+                <icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png"
                         I18N="Tab in help menu" text="General"/>
-                <icon-button id="page2" width="128" height="128" icon="gui/mode_ftl.png"
+                <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
                         I18N="Tab in help menu" text="Game Modes"/>
-                <icon-button id="page3" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="page3" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Tab in help menu" text="Powerups"/>
-                <icon-button id="page4" width="128" height="128" icon="gui/banana.png"
+                <icon-button id="page4" width="128" height="128" icon="gui/icons/banana.png"
                         I18N="Tab in help menu" text="Bananas"/>
-                <icon-button id="page5" width="128" height="128" icon="gui/story_mode_book.png"
+                <icon-button id="page5" width="128" height="128" icon="gui/icons/story_mode_book.png"
                         I18N="Tab in help menu" text="Story Mode"/>
-                <icon-button id="page6" width="128" height="128" icon="gui/mass.png"
+                <icon-button id="page6" width="128" height="128" icon="gui/icons/mass.png"
                         I18N="Tab in help menu" text="Kart classes"/>
-                <icon-button id="page7" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="page7" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Tab in help menu" text="Multi-player"/>
             </vertical-tabs>
 
@@ -29,7 +29,7 @@
             <box width="80%" height="100%" layout="vertical-row">
                 <label align="center" I18N="In the help menu" text="SuperTuxKart can be played in multiplayer mode online...:"/>
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/networking_icon.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/networking_icon.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -37,7 +37,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/crown.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/crown.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -47,7 +47,7 @@
                 <label align="center" I18N="In the help menu" text="... or on the same computer:"/>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/options_input.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/options_input.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
@@ -55,7 +55,7 @@
                 </div>
 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="64" height="64" icon="gui/random_kart.png"/>
+                    <icon align="center" width="64" height="64" icon="gui/icons/random_kart.png"/>
                     <spacer width="25" height="25"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
diff --git a/data/gui/karts.stkgui b/data/gui/screens/karts.stkgui
similarity index 92%
rename from data/gui/karts.stkgui
rename to data/gui/screens/karts.stkgui
index 2d0699fac..f7f681209 100644
--- a/data/gui/karts.stkgui
+++ b/data/gui/screens/karts.stkgui
@@ -24,5 +24,5 @@
         <spacer width="100%" height="2%"/>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/main_menu.stkgui b/data/gui/screens/main_menu.stkgui
similarity index 78%
rename from data/gui/main_menu.stkgui
rename to data/gui/screens/main_menu.stkgui
index d796f1dd3..e9beace0b 100644
--- a/data/gui/main_menu.stkgui
+++ b/data/gui/screens/main_menu.stkgui
@@ -5,23 +5,23 @@
     </div>
 
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-        <icon id="logo" align="center" proportion="5" width="100%" icon="gui/logo.png"/>
+        <icon id="logo" align="center" proportion="5" width="100%" icon="gui/icons/logo.png"/>
 
         <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
             <icon-button id="story" width="128" height="128"
-                         icon="gui/menu_story.png" focus_icon="gui/menu_story_focus.png"
+                         icon="gui/icons/menu_story.png" focus_icon="gui/icons/menu_story_focus.png"
                          I18N="Main menu button"  text="Story Mode"/>
             <icon-button id="new" width="128" height="128"
-                         icon="gui/menu_race.png" focus_icon="gui/menu_race_focus.png"
+                         icon="gui/icons/menu_race.png" focus_icon="gui/icons/menu_race_focus.png"
                          I18N="Main menu button" text="Singleplayer"/>
             <icon-button id="multiplayer" width="128" height="128"
-                         icon="gui/menu_multi.png" focus_icon="gui/menu_multi_focus.png"
+                         icon="gui/icons/menu_multi.png" focus_icon="gui/icons/menu_multi_focus.png"
                          I18N="Main menu button" text="Multiplayer"/>
             <icon-button id="online" width="128" height="128"
-                         icon="gui/menu_online.png" focus_icon="gui/menu_online_focus.png"
+                         icon="gui/icons/menu_online.png" focus_icon="gui/icons/menu_online_focus.png"
                          I18N="Main menu button" text="Online"/>
             <icon-button id="addons" width="128" height="128"
-                         icon="gui/menu_addons.png" focus_icon="gui/menu_addons_focus.png"
+                         icon="gui/icons/menu_addons.png" focus_icon="gui/icons/menu_addons_focus.png"
                          I18N="Main menu button"  text="Addons"/>
         </buttonbar>
 
@@ -39,31 +39,31 @@
             <spacer width="10" height="10" />
 
             <buttonbar id="menu_bottomrow" x="0" y="0" width="42%" height="100%" align="center">
-                <icon-button id="test_gpwin" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_gpwin" width="64" height="64" icon="gui/icons/main_options.png"
                              raw_text="TEST: GPWin" label_location="hover"/>
-                <icon-button id="test_gplose" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_gplose" width="64" height="64" icon="gui/icons/main_options.png"
                              raw_text="TEST: GPLose" label_location="hover"/>
-                <icon-button id="test_unlocked" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_unlocked" width="64" height="64" icon="gui/icons/main_options.png"
                              raw_text="TEST: Unlocked" label_location="hover"/>
-                <icon-button id="test_unlocked2" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_unlocked2" width="64" height="64" icon="gui/icons/main_options.png"
                              raw_text="TEST: Unlocked 2" label_location="hover"/>
-                <icon-button id="test_intro" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_intro" width="64" height="64" icon="gui/icons/main_options.png"
                              raw_text="TEST: Intro" label_location="hover"/>
-                <icon-button id="test_outro" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="test_outro" width="64" height="64" icon="gui/icons/main_options.png"
                              raw_text="TEST: Outro" label_location="hover"/>     
-                <icon-button id="options" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="options" width="64" height="64" icon="gui/icons/main_options.png"
                              I18N="In the main screen"  text="Options" label_location="hover"/>
-                <icon-button id="help" width="64" height="64" icon="gui/main_help.png"
+                <icon-button id="help" width="64" height="64" icon="gui/icons/main_help.png"
                              I18N="In the main screen" text="Help" label_location="hover"/>
-                <icon-button id="startTutorial" width="64" height="64" icon="gui/tutorial.png"
+                <icon-button id="startTutorial" width="64" height="64" icon="gui/icons/tutorial.png"
                              I18N="In the main screen" text="Tutorial" label_location="hover"/>
-                <icon-button id="achievements" width="64" height="64" icon="gui/gp_copy.png"
+                <icon-button id="achievements" width="64" height="64" icon="gui/icons/gp_copy.png"
                              I18N="In the main screen" text="Achievements" label_location="hover"/>
-                <icon-button id="gpEditor" width="64" height="64" icon="gui/gpeditor.png"
+                <icon-button id="gpEditor" width="64" height="64" icon="gui/icons/gpeditor.png"
                              I18N="In the main screen" text="Grand Prix Editor" label_location="hover"/>
-                <icon-button id="about" width="64" height="64" icon="gui/main_about.png"
+                <icon-button id="about" width="64" height="64" icon="gui/icons/main_about.png"
                              I18N="In the main screen" text="About" label_location="hover"/>
-                <icon-button id="quit" width="64" height="64" icon="gui/main_quit.png"
+                <icon-button id="quit" width="64" height="64" icon="gui/icons/main_quit.png"
                              I18N="In the main screen" text="Quit" label_location="hover"/>
             </buttonbar>
         </bottombar>
diff --git a/data/gui/online/create_server.stkgui b/data/gui/screens/online/create_server.stkgui
similarity index 91%
rename from data/gui/online/create_server.stkgui
rename to data/gui/screens/online/create_server.stkgui
index b04a751da..c07bb633d 100644
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/screens/online/create_server.stkgui
@@ -27,24 +27,24 @@
 
             <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Difficulty"/>
             <ribbon id="difficulty" height="15%" width="90%" align="center">
-                <icon-button id="novice" width="128" height="128" icon="gui/difficulty_easy.png"
+                <icon-button id="novice" width="128" height="128" icon="gui/icons/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="128" height="128" icon="gui/icons/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="128" height="128" icon="gui/icons/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="128" height="128" icon="gui/icons/difficulty_best.png"
                         I18N="Difficulty"  text="SuperTux"/>
             </ribbon>
             <label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Game mode"/>
             <ribbon id="gamemode" height="15%" width="90%" align="center">
-                <icon-button id="normal" width="128" height="128" icon="gui/mode_normal.png"
+                <icon-button id="normal" width="128" height="128" icon="gui/icons/mode_normal.png"
                         I18N="Multiplayer game mode" text="Normal Race"/>
-                <icon-button id="timetrial" width="128" height="128" icon="gui/mode_tt.png"
+                <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
                         I18N="Multiplayer game mode" text="Time Trial"/>
-                <icon-button id="3strikes" width="128" height="128" icon="gui/weapons.png"
+                <icon-button id="3strikes" width="128" height="128" icon="gui/icons/weapons.png"
                         I18N="Multiplayer game mode" text="Battle"/>
-                <icon-button id="soccer" width="128" height="128" icon="gui/mode_soccer.png"
+                <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
                         I18N="Multiplayer game mode" text="Soccer"/>
             </ribbon>
 
@@ -57,9 +57,9 @@
             <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
 
             <buttonbar id="options" x="0" y="0" width="25%" height="12%" align="center">
-                <icon-button id="create" width="64" height="64" icon="gui/green_check.png"
+                <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"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                              I18N="In the server creation screen" text="Cancel" label_location="bottom"/>
             </buttonbar>
             
diff --git a/data/gui/online/guest_login.stkgui b/data/gui/screens/online/guest_login.stkgui
similarity index 89%
rename from data/gui/online/guest_login.stkgui
rename to data/gui/screens/online/guest_login.stkgui
index afaf35273..f27dd4e38 100644
--- a/data/gui/online/guest_login.stkgui
+++ b/data/gui/screens/online/guest_login.stkgui
@@ -5,11 +5,11 @@
         <spacer height="15" width="10"/>
 
         <tabs id="login_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_login" width="128" height="128" icon="gui/track_random.png"
+            <icon-button id="tab_login" width="128" height="128" icon="gui/icons/track_random.png"
                     I18N="Tab in login menu" text="Sign In"/>
-            <icon-button id="tab_guest_login" width="128" height="128" icon="gui/mode_ftl.png"
+            <icon-button id="tab_guest_login" width="128" height="128" icon="gui/icons/mode_ftl.png"
                     I18N="Tab in login menu" text="Sign In As Guest"/>
-            <icon-button id="tab_register" width="128" height="128" icon="gui/mode_ftl.png"
+            <icon-button id="tab_register" width="128" height="128" icon="gui/icons/mode_ftl.png"
                     I18N="Tab in login menu" text="Register"/>
         </tabs>
 
@@ -26,14 +26,14 @@
             </box>
             <spacer height="15" width="10"/>
             <buttonbar id="options" width="90%" height="13%" align="bottom">
-                <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
+                <icon-button id="sign_in" width="64" height="64" icon="gui/icons/green_check.png"
                              I18N="In the login dialog"  text="Log In" label_location="bottom"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
                              I18N="In the login dialog" text="Close" label_location="bottom"/>
             </buttonbar>
             <spacer height="15" width="10"/>
         </box>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/online/lan.stkgui b/data/gui/screens/online/lan.stkgui
similarity index 71%
rename from data/gui/online/lan.stkgui
rename to data/gui/screens/online/lan.stkgui
index c94e6082a..01bc3bfb0 100644
--- a/data/gui/online/lan.stkgui
+++ b/data/gui/screens/online/lan.stkgui
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
 
         <spacer height="5%" width="10"/>
-        <icon id="logo" align="center" proportion="1" width="100%" icon="gui/logo.png"/>
+        <icon id="logo" align="center" proportion="1" width="100%" icon="gui/icons/logo.png"/>
         <spacer height="5%" width="10"/>
         
         <buttonbar id="lan" proportion="1" width="90%" align="center">
             <icon-button id="find_lan_server" width="128" height="128"
-                         icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                         icon="gui/icons/online/menu_find_server.png" focus_icon="gui/icons/online/menu_find_server_hover.png"
                          I18N="In the online multiplayer screen" text="Find Server"/>
             <icon-button id="create_lan_server" width="128" height="128"
-                         icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                         icon="gui/icons/online/menu_create_server.png" focus_icon="gui/icons/online/menu_create_server_hover.png"
                          I18N="In the online multiplayer screen" text="Create Server"/>
                          <!--
             <icon-button id="manage_user" width="128" height="128"
-                         icon="gui/options_players.png"
+                         icon="gui/icons/options_players.png"
                          I18N="In the online multiplayer screen" text="Users"/>
                          -->
         </buttonbar>
diff --git a/data/gui/online/lobby_settings.stkgui b/data/gui/screens/online/lobby_settings.stkgui
similarity index 94%
rename from data/gui/online/lobby_settings.stkgui
rename to data/gui/screens/online/lobby_settings.stkgui
index 71f975d54..54827e445 100644
--- a/data/gui/online/lobby_settings.stkgui
+++ b/data/gui/screens/online/lobby_settings.stkgui
@@ -27,5 +27,5 @@
 
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/online/networking_lobby.stkgui b/data/gui/screens/online/networking_lobby.stkgui
similarity index 90%
rename from data/gui/online/networking_lobby.stkgui
rename to data/gui/screens/online/networking_lobby.stkgui
index 9b552332a..be47888e2 100644
--- a/data/gui/online/networking_lobby.stkgui
+++ b/data/gui/screens/online/networking_lobby.stkgui
@@ -26,12 +26,12 @@
                 </div>
             </box>
             <spacer width="3%"/>
-            <icon-button id="start" proportion="1" width="64" height="64" icon="gui/green_check.png" align="top"
+            <icon-button id="start" proportion="1" width="64" height="64" icon="gui/icons/green_check.png" align="top"
                 I18N="In the network lobby" text="Start race"/>
-            <icon-button id="exit" proportion="1" width="64" height="64" icon="gui/main_quit.png" align="top"
+            <icon-button id="exit" proportion="1" width="64" height="64" icon="gui/icons/main_quit.png" align="top"
                 I18N="In the network lobby" text="Exit"/>
         </div>
         <spacer height="1%"/>
     </div>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/online/online.stkgui b/data/gui/screens/online/online.stkgui
similarity index 75%
rename from data/gui/online/online.stkgui
rename to data/gui/screens/online/online.stkgui
index 6a9e0030e..65f9f0c1f 100644
--- a/data/gui/online/online.stkgui
+++ b/data/gui/screens/online/online.stkgui
@@ -16,22 +16,22 @@
         </box>
 
         <spacer height="15" width="10"/>
-        <icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo.png"/>
+        <icon id="logo" align="center" proportion="4" width="100%" icon="gui/icons/logo.png"/>
 
         <spacer height="15" width="10"/>
         
         <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
             <icon-button id="lan" width="128" height="128"
-                         icon="gui/menu_multi.png" focus_icon="gui/menu_multi_focus.png"
+                         icon="gui/icons/menu_multi.png" focus_icon="gui/icons/menu_multi_focus.png"
                          I18N="Networking menu button" text="Local networking"/>
             <icon-button id="wan" width="128" height="128"
-                         icon="gui/menu_multi.png" focus_icon="gui/menu_multi_focus.png"
+                         icon="gui/icons/menu_multi.png" focus_icon="gui/icons/menu_multi_focus.png"
                          I18N="Networking menu button" text="Global networking"/>
             <icon-button id="enter-address" width="128" height="128"
-                         icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
+                         icon="gui/icons/online/menu_quick_play.png" focus_icon="gui/icons/online/menu_quick_play_hover.png"
                          I18N="Networking menu button" text="Enter server address"/>
             <icon-button id="online" width="128" height="128"
-                         icon="gui/menu_online.png" focus_icon="gui/menu_online_focus.png"
+                         icon="gui/icons/menu_online.png" focus_icon="gui/icons/menu_online_focus.png"
                          I18N="Networking menu button" text="Your profile"/>
         </buttonbar>
 
@@ -39,5 +39,5 @@
 
     </div>
     
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/online/profile_achievements.stkgui b/data/gui/screens/online/profile_achievements.stkgui
similarity index 84%
rename from data/gui/online/profile_achievements.stkgui
rename to data/gui/screens/online/profile_achievements.stkgui
index ec4008ef3..5047b81ad 100644
--- a/data/gui/online/profile_achievements.stkgui
+++ b/data/gui/screens/online/profile_achievements.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
diff --git a/data/gui/online/profile_achievements_tab.stkgui b/data/gui/screens/online/profile_achievements_tab.stkgui
similarity index 82%
rename from data/gui/online/profile_achievements_tab.stkgui
rename to data/gui/screens/online/profile_achievements_tab.stkgui
index 9de782aba..23297e21f 100644
--- a/data/gui/online/profile_achievements_tab.stkgui
+++ b/data/gui/screens/online/profile_achievements_tab.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
@@ -9,10 +9,10 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/icons/gp_copy.png"
                 I18N="Section in the profile screen" text="Achievements"/>
-            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>
-            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/icons/options_players.png"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/icons/main_options.png"/>
         </tabs>
 
         <box proportion="1" width="100%" layout="vertical-row" padding="6">
diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/screens/online/profile_friends.stkgui
similarity index 88%
rename from data/gui/online/profile_friends.stkgui
rename to data/gui/screens/online/profile_friends.stkgui
index e0e49473b..c21341531 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/screens/online/profile_friends.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
@@ -9,10 +9,10 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
-            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/icons/gp_copy.png"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/icons/options_players.png"
                 I18N="Section in the profile screen" text="Friends"/>
-            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/icons/main_options.png"/>
         </tabs>
 
         <box proportion="1" width="100%" layout="vertical-row" padding="6">
diff --git a/data/gui/online/profile_overview.stkgui b/data/gui/screens/online/profile_overview.stkgui
similarity index 79%
rename from data/gui/online/profile_overview.stkgui
rename to data/gui/screens/online/profile_overview.stkgui
index eed9c717b..72153424a 100644
--- a/data/gui/online/profile_overview.stkgui
+++ b/data/gui/screens/online/profile_overview.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
 
@@ -9,11 +9,11 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png"
+            <icon-button id="tab_overview" width="128" height="128" icon="gui/icons/options_ui.png"
                 I18N="Section in the profile screen" text="Overview"/>
-            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
-            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/icons/options_players.png" />
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/icons/gp_copy.png"/>
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/icons/main_options.png"/>
         </tabs>
 
         <box proportion="1" width="100%" layout="vertical-row">
diff --git a/data/gui/online/profile_servers.stkgui b/data/gui/screens/online/profile_servers.stkgui
similarity index 67%
rename from data/gui/online/profile_servers.stkgui
rename to data/gui/screens/online/profile_servers.stkgui
index 88de78d8c..b49732cd8 100644
--- a/data/gui/online/profile_servers.stkgui
+++ b/data/gui/screens/online/profile_servers.stkgui
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
 
         <spacer height="5%" width="10"/>
-        <icon id="logo" align="center" proportion="1" width="100%" icon="gui/logo.png"/>
+        <icon id="logo" align="center" proportion="1" width="100%" icon="gui/icons/logo.png"/>
         <spacer height="5%" width="10"/>
         
         <buttonbar id="wan" proportion="1" width="90%" align="center">
             <icon-button id="find_wan_server" width="128" height="128"
-                         icon="gui/online/menu_find_server.png" focus_icon="gui/online/menu_find_server_hover.png"
+                         icon="gui/icons/online/menu_find_server.png" focus_icon="gui/icons/online/menu_find_server_hover.png"
                          I18N="In the online multiplayer screen" text="Find Server"/>
             <icon-button id="create_wan_server" width="128" height="128"
-                         icon="gui/online/menu_create_server.png" focus_icon="gui/online/menu_create_server_hover.png"
+                         icon="gui/icons/online/menu_create_server.png" focus_icon="gui/icons/online/menu_create_server_hover.png"
                          I18N="In the online multiplayer screen" text="Create Server"/>
             <icon-button id="quick_wan_play" width="128" height="128"
-                         icon="gui/online/menu_quick_play.png" focus_icon="gui/online/menu_quick_play_hover.png"
+                         icon="gui/icons/online/menu_quick_play.png" focus_icon="gui/icons/online/menu_quick_play_hover.png"
                          I18N="In the online multiplayer screen" text="Quick Play"/>
         </buttonbar>
 
diff --git a/data/gui/online/profile_settings.stkgui b/data/gui/screens/online/profile_settings.stkgui
similarity index 85%
rename from data/gui/online/profile_settings.stkgui
rename to data/gui/screens/online/profile_settings.stkgui
index d89d52c23..e6a73f2d1 100644
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/screens/online/profile_settings.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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="..."/>
@@ -8,9 +8,9 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
-            <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
-            <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/icons/gp_copy.png"/>
+            <icon-button id="tab_friends" width="128" height="128" icon="gui/icons/options_players.png" />
+            <icon-button id="tab_settings" width="128" height="128" icon="gui/icons/main_options.png"
                 I18N="Section in the profile screen" text="Account Settings"/>
         </tabs>
 
diff --git a/data/gui/online/register.stkgui b/data/gui/screens/online/register.stkgui
similarity index 94%
rename from data/gui/online/register.stkgui
rename to data/gui/screens/online/register.stkgui
index 1e991506f..790e8fd3a 100644
--- a/data/gui/online/register.stkgui
+++ b/data/gui/screens/online/register.stkgui
@@ -6,11 +6,11 @@
                 I18N="In the registration dialog" />
       <spacer height="15" width="10"/>
       <tabs id="mode_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-        <icon-button id="tab_new_online" width="128" height="128" icon="gui/main_network.png"
+        <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"/>
-        <icon-button id="tab_existing_online" width="128" height="128" icon="gui/main_network.png"
+        <icon-button id="tab_existing_online" width="128" height="128" icon="gui/icons/main_network.png"
                      I18N="Section in the register screen" text="Existing Online Account"/>
-        <icon-button id="tab_offline" width="128" height="128" icon="gui/options_players.png"
+        <icon-button id="tab_offline" width="128" height="128" icon="gui/icons/options_players.png"
                      I18N="Section in the register screen" text="Offline Account"/>
       </tabs>
 
@@ -61,13 +61,13 @@
             </div>
 
             <buttonbar id="options" width="40%" height="15%" align="center">
-                <icon-button id="next" width="50%" height="90%" icon="gui/green_check.png"
+                <icon-button id="next" width="50%" height="90%" icon="gui/icons/green_check.png"
                     I18N="In the registration dialog" text="OK" label_location="none"/>
-                <icon-button id="cancel" width="50%" height="90%" icon="gui/main_quit.png"
+                <icon-button id="cancel" width="50%" height="90%" icon="gui/icons/main_quit.png"
                     I18N="In the registration dialog"  text="Cancel" label_location="none"/>
             </buttonbar>
         </box>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/online/server_selection.stkgui b/data/gui/screens/online/server_selection.stkgui
similarity index 89%
rename from data/gui/online/server_selection.stkgui
rename to data/gui/screens/online/server_selection.stkgui
index 571f5aa16..b48c48e9c 100644
--- a/data/gui/online/server_selection.stkgui
+++ b/data/gui/screens/online/server_selection.stkgui
@@ -3,9 +3,9 @@
     <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/back.png"/>
+            <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/restart.png"/>
+            <icon-button id="reload"   height="90%" icon="gui/icons/restart.png"/>
         </div>
 
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
diff --git a/data/gui/online/user_search.stkgui b/data/gui/screens/online/user_search.stkgui
similarity index 90%
rename from data/gui/online/user_search.stkgui
rename to data/gui/screens/online/user_search.stkgui
index 6f56a8f7a..45c723d3c 100644
--- a/data/gui/online/user_search.stkgui
+++ b/data/gui/screens/online/user_search.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
diff --git a/data/gui/options_audio.stkgui b/data/gui/screens/options_audio.stkgui
similarity index 92%
rename from data/gui/options_audio.stkgui
rename to data/gui/screens/options_audio.stkgui
index 820cc7a08..7d2e8ac09 100644
--- a/data/gui/options_audio.stkgui
+++ b/data/gui/screens/options_audio.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
diff --git a/data/gui/options_device.stkgui b/data/gui/screens/options_device.stkgui
similarity index 89%
rename from data/gui/options_device.stkgui
rename to data/gui/screens/options_device.stkgui
index 652dfd621..f57b9c810 100644
--- a/data/gui/options_device.stkgui
+++ b/data/gui/screens/options_device.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
diff --git a/data/gui/options_input.stkgui b/data/gui/screens/options_input.stkgui
similarity index 87%
rename from data/gui/options_input.stkgui
rename to data/gui/screens/options_input.stkgui
index a56c8bc0a..9f85e953a 100644
--- a/data/gui/options_input.stkgui
+++ b/data/gui/screens/options_input.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
diff --git a/data/gui/options_language.stkgui b/data/gui/screens/options_language.stkgui
similarity index 84%
rename from data/gui/options_language.stkgui
rename to data/gui/screens/options_language.stkgui
index 46683a015..7a977e2e3 100644
--- a/data/gui/options_language.stkgui
+++ b/data/gui/screens/options_language.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
diff --git a/data/gui/options_players.stkgui b/data/gui/screens/options_players.stkgui
similarity index 88%
rename from data/gui/options_players.stkgui
rename to data/gui/screens/options_players.stkgui
index 5c8de774c..66f2158b2 100644
--- a/data/gui/options_players.stkgui
+++ b/data/gui/screens/options_players.stkgui
@@ -6,12 +6,12 @@
         <spacer height="15" width="10"/>
 
         <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
-            <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
-            <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
-            <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+            <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"/>
+            <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"/>
+            <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"/>
+            <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                     I18N="Section in the settings menu" text="Players"/>
-            <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"/>
+            <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"/>
         </tabs>
 
         <box proportion="1" width="100%" layout="vertical-row">
@@ -47,5 +47,5 @@
         </box>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/options_ui.stkgui b/data/gui/screens/options_ui.stkgui
similarity index 93%
rename from data/gui/options_ui.stkgui
rename to data/gui/screens/options_ui.stkgui
index a895a2bf9..ba63008d5 100644
--- a/data/gui/options_ui.stkgui
+++ b/data/gui/screens/options_ui.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
diff --git a/data/gui/options_video.stkgui b/data/gui/screens/options_video.stkgui
similarity index 93%
rename from data/gui/options_video.stkgui
rename to data/gui/screens/options_video.stkgui
index 4e10b37f6..b3fa50e62 100644
--- a/data/gui/options_video.stkgui
+++ b/data/gui/screens/options_video.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
diff --git a/data/gui/race_result.stkgui b/data/gui/screens/race_result.stkgui
similarity index 100%
rename from data/gui/race_result.stkgui
rename to data/gui/screens/race_result.stkgui
diff --git a/data/gui/race_setup.stkgui b/data/gui/screens/race_setup.stkgui
similarity index 87%
rename from data/gui/race_setup.stkgui
rename to data/gui/screens/race_setup.stkgui
index 0b7b92b75..0762a3bdb 100644
--- a/data/gui/race_setup.stkgui
+++ b/data/gui/screens/race_setup.stkgui
@@ -10,13 +10,13 @@
         <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/difficulty_easy.png"
+                <icon-button id="novice" width="fit" height="fit" icon="gui/icons/difficulty_easy.png"
                         I18N="Difficulty" text="Novice"/>
-                <icon-button id="intermediate" width="fit" height="fit" icon="gui/difficulty_medium.png"
+                <icon-button id="intermediate" width="fit" height="fit" icon="gui/icons/difficulty_medium.png"
                         I18N="Difficulty" text="Intermediate"/>
-                <icon-button id="expert" width="fit" height="fit" icon="gui/difficulty_hard.png"
+                <icon-button id="expert" width="fit" height="fit" icon="gui/icons/difficulty_hard.png"
                         I18N="Difficulty"  text="Expert"/>
-                <icon-button id="best" width="fit" height="fit" icon="gui/difficulty_best.png"
+                <icon-button id="best" width="fit" height="fit" icon="gui/icons/difficulty_best.png"
                         I18N="Difficulty"  text="SuperTux"/>
             </ribbon>
         </box>
@@ -33,5 +33,5 @@
         </box>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/soccer_setup.stkgui b/data/gui/screens/soccer_setup.stkgui
similarity index 90%
rename from data/gui/soccer_setup.stkgui
rename to data/gui/screens/soccer_setup.stkgui
index 85d04b467..777fbdacd 100644
--- a/data/gui/soccer_setup.stkgui
+++ b/data/gui/screens/soccer_setup.stkgui
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
-    <icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/soccer_ball_red.png" width="7%" height="7%"/>
-    <icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/soccer_ball_blue.png" width="7%" height="7%"/>
+    <icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/icons/soccer_ball_red.png" width="7%" height="7%"/>
+    <icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/icons/soccer_ball_blue.png" width="7%" height="7%"/>
 
     <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" >
 
diff --git a/data/gui/track_info.stkgui b/data/gui/screens/track_info.stkgui
similarity index 91%
rename from data/gui/track_info.stkgui
rename to data/gui/screens/track_info.stkgui
index 24323d9a5..3f1817470 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/screens/track_info.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/back.png"/>
+    <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 id="name" height="7%" width="80%" align="center" text_align="center"/>
@@ -19,7 +19,7 @@
                 <spacer width="1" height="2%"/>
 
                 <div width="95%" height="fit" layout="horizontal-row">
-                    <icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
+                    <icon id="iconscore1" icon="gui/icons/random_kart.png" width="font" height="font"/>
                     <spacer width="2%" height="1"/>
                     <label id="highscore1" proportion="1" text="(Empty)"/>
                 </div>
@@ -27,7 +27,7 @@
                 <spacer width="1" height="2%"/>
 
                 <div width="95%" height="fit" layout="horizontal-row">
-                    <icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
+                    <icon id="iconscore2" icon="gui/icons/random_kart.png" width="font" height="font"/>
                     <spacer width="2%" height="1"/>
                     <label id="highscore2" proportion="1" text="(Empty)"/>
                 </div>
@@ -35,7 +35,7 @@
                 <spacer width="1" height="2%"/>
 
                 <div width="95%" height="fit" layout="horizontal-row">
-                    <icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
+                    <icon id="iconscore3" icon="gui/icons/random_kart.png" width="font" height="font"/>
                     <spacer width="2%" height="1"/>
                     <label id="highscore3" proportion="1" text="(Empty)"/>
                 </div>
@@ -91,7 +91,7 @@
         </box>
         <spacer width="1" height="1%"/>
         <buttonbar id="buttons" height="17%" width="100%" align="center">
-            <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
+            <icon-button id="start" width="64" height="64" icon="gui/icons/green_check.png"
                     I18N="In the track info screen" text="Start Race"/>
 
         </buttonbar>
diff --git a/data/gui/tracks.stkgui b/data/gui/screens/tracks.stkgui
similarity index 96%
rename from data/gui/tracks.stkgui
rename to data/gui/screens/tracks.stkgui
index 7ad758a66..d00682385 100644
--- a/data/gui/tracks.stkgui
+++ b/data/gui/screens/tracks.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div id="all-track" x="1%" y="1%" width="60%" height="96%" layout="vertical-row" >
         <header width="80%" I18N="In the track selection screen" text="All Tracks"
diff --git a/data/gui/tracks_and_gp.stkgui b/data/gui/screens/tracks_and_gp.stkgui
similarity index 93%
rename from data/gui/tracks_and_gp.stkgui
rename to data/gui/screens/tracks_and_gp.stkgui
index 7c61a383c..3473d6dbd 100644
--- a/data/gui/tracks_and_gp.stkgui
+++ b/data/gui/screens/tracks_and_gp.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 
     <div x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
 
diff --git a/data/gui/user_screen.stkgui b/data/gui/screens/user_screen.stkgui
similarity index 93%
rename from data/gui/user_screen.stkgui
rename to data/gui/screens/user_screen.stkgui
index bea8952df..0451a5395 100644
--- a/data/gui/user_screen.stkgui
+++ b/data/gui/screens/user_screen.stkgui
@@ -58,17 +58,17 @@
 			
 			<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"
+					<icon-button id="ok" width="fit" height="fit" 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/blue_plus.png"
+					<icon-button id="new_user" width="fit" height="fit" 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/remove.png"
+					<icon-button id="delete" width="fit" height="fit" 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/rename.png"
+					<icon-button id="rename" width="fit" height="fit" 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/edit.png"
+					<icon-button id="default_kart_color" width="fit" height="fit" 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/main_quit.png"
+					<icon-button id="cancel" width="fit" height="fit" icon="gui/icons/main_quit.png"
 								 I18N="In the user screen" text="Cancel" label_location="bottom"/>
 				</buttonbar>
 			</div>
@@ -77,5 +77,5 @@
         <spacer width="20" height="15"/>
     </div>
 
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>
diff --git a/data/gui/user_screen_tab.stkgui b/data/gui/screens/user_screen_tab.stkgui
similarity index 90%
rename from data/gui/user_screen_tab.stkgui
rename to data/gui/screens/user_screen_tab.stkgui
index f7f130bfe..d330e8613 100644
--- a/data/gui/user_screen_tab.stkgui
+++ b/data/gui/screens/user_screen_tab.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/back.png"/>
+    <icon-button id="back" x="0" y="0" height="8%" 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"/>
         <spacer width="100%" height="1%"/>
@@ -8,17 +8,17 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
-                <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
-                <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
                         I18N="Section in the settings menu" text="Audio"/>
-                <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
                         I18N="Section in the settings menu" text="User Interface"/>
-                <icon-button id="tab_players" width="128" height="128" icon="gui/options_players.png"
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
                         I18N="Section in the settings menu" text="Players"/>
-                <icon-button id="tab_controls" width="128" height="128" icon="gui/options_input.png"
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
                         I18N="Section in the settings menu" text="Controls"/>
-                <icon-button id="tab_language" width="128" height="128" icon="gui/options_language.png"
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
                         I18N="Section in the settings menu" text="Language"/>
             </vertical-tabs>
 
@@ -77,17 +77,17 @@
 
                 <div width="100%" 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"
+                        <icon-button id="ok" width="fit" height="fit" 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/blue_plus.png"
+                        <icon-button id="new_user" width="fit" height="fit" 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/remove.png"
+                        <icon-button id="delete" width="fit" height="fit" 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/rename.png"
+                        <icon-button id="rename" width="fit" height="fit" 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/edit.png"
+                        <icon-button id="default_kart_color" width="fit" height="fit" 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/main_quit.png"
+                        <icon-button id="cancel" width="fit" height="fit" icon="gui/icons/main_quit.png"
                                      I18N="In the user screen" text="Cancel" label_location="bottom"/>
                     </buttonbar>
                 </div>
diff --git a/src/config/player_profile.cpp b/src/config/player_profile.cpp
index 913c70aa5..60a9c40e3 100644
--- a/src/config/player_profile.cpp
+++ b/src/config/player_profile.cpp
@@ -188,7 +188,7 @@ const std::string PlayerProfile::getIconFilename() const
     if(m_icon_filename.size()==0 ||
        !file_manager->fileExists(file_manager->getUserConfigFile(m_icon_filename)))
     {
-        return file_manager->getAsset(FileManager::GUI, "main_help.png");
+        return file_manager->getAsset(FileManager::GUI_ICON, "main_help.png");
     }
 
     return file_manager->getUserConfigFile(m_icon_filename);
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 23d39054d..21612d3af 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -956,7 +956,7 @@ void IrrDriver::applyResolutionSettings()
 
     GUIEngine::addLoadingIcon(
         irr_driver->getTexture(file_manager
-                               ->getAsset(FileManager::GUI,"options_video.png"))
+                               ->getAsset(FileManager::GUI_ICON,"options_video.png"))
                              );
 
     file_manager->pushTextureSearchPath(file_manager->getAsset(FileManager::MODEL,""), "models");
@@ -972,14 +972,14 @@ void IrrDriver::applyResolutionSettings()
     projectile_manager->loadData();
     Referee::init();
     GUIEngine::addLoadingIcon(
-        irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"gift.png")) );
+        irr_driver->getTexture(file_manager->getAsset(FileManager::GUI_ICON,"gift.png")) );
 
 
     kart_properties_manager->loadAllKarts();
 
     attachment_manager->loadModels();
     file_manager->popTextureSearchPath();
-    std::string banana = file_manager->getAsset(FileManager::GUI, "banana.png");
+    std::string banana = file_manager->getAsset(FileManager::GUI_ICON, "banana.png");
     GUIEngine::addLoadingIcon(irr_driver->getTexture(banana) );
     // No need to reload cached track data (track_manager->cleanAllCachedData
     // above) - this happens dynamically when the tracks are loaded.
diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index a6efd9a72..290b96df9 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -229,7 +229,7 @@ void ParticleEmitter::setParticleType(const ParticleKind* type)
         }
         else
         {
-            std::string help = file_manager->getAsset(FileManager::GUI, "main_help.png");
+            std::string help = file_manager->getAsset(FileManager::GUI_ICON, "main_help.png");
             m_node->setMaterialTexture(0, irr_driver->getTexture(help));
         }
 
diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp
index ad46622b8..317c17a1a 100644
--- a/src/guiengine/engine.cpp
+++ b/src/guiengine/engine.cpp
@@ -1276,7 +1276,7 @@ namespace GUIEngine
 
         g_skin->drawBgImage();
         ITexture* loading =
-            irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,
+            irr_driver->getTexture(file_manager->getAsset(FileManager::GUI_ICON,
                                                           "loading.png"));
 
         if(!loading)
diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp
index c91ec10be..014f57fd9 100644
--- a/src/guiengine/layout_manager.cpp
+++ b/src/guiengine/layout_manager.cpp
@@ -151,7 +151,7 @@ void LayoutManager::readCoords(Widget* self)
 
     if (self->m_properties[PROP_ICON].size() > 0)
     {
-        // PROP_ICON includes paths (e.g. gui/logo.png)
+        // PROP_ICON includes paths (e.g. gui/icons/logo.png)
         ITexture* texture = irr_driver->getTexture(file_manager->getAsset(
                                                     self->m_properties[PROP_ICON]));
 
diff --git a/src/guiengine/modaldialog.cpp b/src/guiengine/modaldialog.cpp
index 3fedfd94c..1d7b37845 100644
--- a/src/guiengine/modaldialog.cpp
+++ b/src/guiengine/modaldialog.cpp
@@ -65,7 +65,7 @@ ModalDialog::ModalDialog(const float percentWidth, const float percentHeight,
 void ModalDialog::loadFromFile(const char* xmlFile)
 {
     doInit();
-    std::string path = file_manager->getAssetChecked(FileManager::GUI,xmlFile,
+    std::string path = file_manager->getAssetChecked(FileManager::GUI_DIALOG,xmlFile,
                                                      true);
     IXMLReader* xml = file_manager->createXMLReader(path);
 
diff --git a/src/guiengine/screen.cpp b/src/guiengine/screen.cpp
index ffccd491f..995a9711c 100644
--- a/src/guiengine/screen.cpp
+++ b/src/guiengine/screen.cpp
@@ -130,7 +130,7 @@ void Screen::loadFromFile()
 {
     assert(m_magic_number == 0xCAFEC001);
 
-    std::string path = file_manager->getAssetChecked(FileManager::GUI, m_filename, true);
+    std::string path = file_manager->getAssetChecked(FileManager::GUI_SCREEN, m_filename, true);
     IXMLReader* xml = file_manager->createXMLReader( path );
 
     parseScreenFileDiv(xml, m_widgets);
diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index c5f971a41..76bdab3b3 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1776,7 +1776,7 @@ void Skin::renderSections(PtrVector<Widget>* within_vector)
                     SkinConfig::m_render_params["bottom-bar::neutral"].getImage();
                 if(!tex)
                 {
-                    tex = irr_driver->getTexture(FileManager::GUI, "main_help.png");
+                    tex = irr_driver->getTexture(FileManager::GUI_ICON, "main_help.png");
                     if(!tex)
                         Log::fatal("Skin",
                         "Can't find fallback texture 'main_help.png, aborting.");
@@ -1790,7 +1790,7 @@ void Skin::renderSections(PtrVector<Widget>* within_vector)
             else if (widget.isTopBar())
             {
                 ITexture* tex =
-                    irr_driver->getTexture(FileManager::GUI, "top_bar.png");
+                    irr_driver->getTexture(FileManager::GUI_ICON, "top_bar.png");
 
                 core::recti r1(0,               0,
                                (int)widget.m_w, (int)widget.m_h);
@@ -2088,21 +2088,21 @@ void Skin::drawBadgeOn(const Widget* widget, const core::recti& rect)
 {
     if (widget->m_badges & LOCKED_BADGE)
     {
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "gui_lock.png");
         float max_icon_size = 0.5f; // Lock badge can be quite big
         doDrawBadge(texture, rect, max_icon_size, true);
     }
     if (widget->m_badges & OK_BADGE)
     {
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "green_check.png");
         float max_icon_size = 0.35f;
         doDrawBadge(texture, rect, max_icon_size, true);
     }
     if (widget->m_badges & BAD_BADGE)
     {
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "red_mark.png");
         float max_icon_size = 0.35f;
         doDrawBadge(texture, rect, max_icon_size, false);
@@ -2110,28 +2110,28 @@ void Skin::drawBadgeOn(const Widget* widget, const core::recti& rect)
     if (widget->m_badges & TROPHY_BADGE)
     {
         float max_icon_size = 0.43f;
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "cup_bronze.png");
         doDrawBadge(texture, rect, max_icon_size, false);
     }
     if (widget->m_badges & KEYBOARD_BADGE)
     {
         float max_icon_size = 0.43f;
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "keyboard.png");
         doDrawBadge(texture, rect, max_icon_size, true);
     }
     if (widget->m_badges & GAMEPAD_BADGE)
     {
         float max_icon_size = 0.43f;
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "gamepad.png");
         doDrawBadge(texture, rect, max_icon_size, true);
     }
     if (widget->m_badges & LOADING_BADGE)
     {
         float max_icon_size = 0.43f;
-        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+        video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "hourglass.png");
         doDrawBadge(texture, rect, max_icon_size, true);
     }
@@ -2410,7 +2410,7 @@ ITexture* Skin::getImage(const char* name)
     }
     else
     {
-        return irr_driver->getTexture(FileManager::GUI,"main_help.png");
+        return irr_driver->getTexture(FileManager::GUI_ICON,"main_help.png");
     }
 }   // getImage
 
diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp
index 7503ec42f..daadc4e91 100644
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@@ -89,11 +89,11 @@ void IconButtonWidget::add()
                 "add() : error, cannot find texture '%s' in iconbutton '%s'.",
                 m_properties[PROP_ICON].c_str(), m_properties[PROP_ID].c_str());
         }
-        std::string file = file_manager->getAsset(FileManager::GUI,"main_help.png");
+        std::string file = file_manager->getAsset(FileManager::GUI_ICON,"main_help.png");
         setTexture(irr_driver->getTexture(file));
         if(!m_texture)
             Log::fatal("IconButtonWidget",
-                  "Can't find fallback texture 'gui/main_help.png, aborting.");
+                  "Can't find fallback texture 'gui/icons/main_help.png, aborting.");
     }
 
     if (m_properties[PROP_FOCUS_ICON].size() > 0)
@@ -270,7 +270,7 @@ void IconButtonWidget::setImage(const char* path_to_texture, IconPathType pathTy
     {
         Log::error("icon_button", "Texture '%s' not found!\n",
                    m_properties[PROP_ICON].c_str());
-        std::string file = file_manager->getAsset(FileManager::GUI,"main_help.png");
+        std::string file = file_manager->getAsset(FileManager::GUI_ICON,"main_help.png");
         setTexture(irr_driver->getTexture(file));
     }
 }
@@ -287,7 +287,7 @@ void IconButtonWidget::setImage(ITexture* texture)
     {
         Log::error("icon_button",
                    "setImage invoked with NULL image pointer\n");
-        std::string file = file_manager->getAsset(FileManager::GUI,"main_help.png");
+        std::string file = file_manager->getAsset(FileManager::GUI_ICON,"main_help.png");
         setTexture(irr_driver->getTexture(file));
     }
 }
diff --git a/src/guiengine/widgets/kart_stats_widget.cpp b/src/guiengine/widgets/kart_stats_widget.cpp
index 1c07c10f6..6a082085b 100644
--- a/src/guiengine/widgets/kart_stats_widget.cpp
+++ b/src/guiengine/widgets/kart_stats_widget.cpp
@@ -106,7 +106,7 @@ void KartStatsWidget::setValues(const KartProperties* props,
     m_skills[SKILL_MASS]->setValue((int)
     	(kp_computed.getCombinedCharacteristic()->getMass()/3.89f));
     m_skills[SKILL_MASS]->setIcon(irr::core::stringc(
-            file_manager->getAsset(FileManager::GUI, "mass.png").c_str()));    
+            file_manager->getAsset(FileManager::GUI_ICON, "mass.png").c_str()));    
     m_skills[SKILL_MASS]->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_mass", m_player_id);
     m_skills[SKILL_MASS]->m_iconbutton->setTooltip( _("Mass") );
     
@@ -115,7 +115,7 @@ void KartStatsWidget::setValues(const KartProperties* props,
     m_skills[SKILL_SPEED]->setValue((int)
     	((kp_computed.getCombinedCharacteristic()->getEngineMaxSpeed() - 20) * 15));
     m_skills[SKILL_SPEED]->setIcon(irr::core::stringc(
-            file_manager->getAsset(FileManager::GUI, "speed.png").c_str()));    
+            file_manager->getAsset(FileManager::GUI_ICON, "speed.png").c_str()));    
     m_skills[SKILL_SPEED]->m_properties[PROP_ID] = StringUtils::insertValues("@p%i_speed", m_player_id);
     m_skills[SKILL_SPEED]->m_iconbutton->setTooltip( _("Maximum speed") );
     
@@ -125,7 +125,7 @@ void KartStatsWidget::setValues(const KartProperties* props,
 
     m_skills[SKILL_ACCELERATION]->setValue((int)(kp_computed.getAccelerationEfficiency()*10));
     m_skills[SKILL_ACCELERATION]->setIcon(irr::core::stringc(
-            file_manager->getAsset(FileManager::GUI, "power.png").c_str()));    
+            file_manager->getAsset(FileManager::GUI_ICON, "power.png").c_str()));    
     m_skills[SKILL_ACCELERATION]->m_properties[PROP_ID] =
         StringUtils::insertValues("@p%i_acceleration", m_player_id);
     m_skills[SKILL_ACCELERATION]->m_iconbutton->setTooltip( _("Acceleration") );
@@ -136,7 +136,7 @@ void KartStatsWidget::setValues(const KartProperties* props,
     m_skills[SKILL_NITRO_EFFICIENCY]->setValue((int)
         (90.0f/kp_computed.getCombinedCharacteristic()->getNitroConsumption()));
     m_skills[SKILL_NITRO_EFFICIENCY]->setIcon(irr::core::stringc(
-            file_manager->getAsset(FileManager::GUI, "nitro.png").c_str()));    
+            file_manager->getAsset(FileManager::GUI_ICON, "nitro.png").c_str()));    
     m_skills[SKILL_NITRO_EFFICIENCY]->m_properties[PROP_ID] =
         StringUtils::insertValues("@p%i_nitro_efficiency", m_player_id);
     m_skills[SKILL_NITRO_EFFICIENCY]->m_iconbutton->setTooltip( _("Nitro efficiency") );
diff --git a/src/guiengine/widgets/model_view_widget.cpp b/src/guiengine/widgets/model_view_widget.cpp
index 1570c3f68..ddee19ba6 100644
--- a/src/guiengine/widgets/model_view_widget.cpp
+++ b/src/guiengine/widgets/model_view_widget.cpp
@@ -54,7 +54,7 @@ m_rtt_size(rtt_size)
     m_angle = 0;
 
     // so that the base class doesn't complain there is no icon defined
-    m_properties[PROP_ICON]="gui/main_help.png";
+    m_properties[PROP_ICON]="gui/icons/main_help.png";
 
     m_rtt_unsupported = ProfileWorld::isNoGraphics();
 }   // ModelViewWidget
@@ -70,7 +70,7 @@ ModelViewWidget::~ModelViewWidget()
 void ModelViewWidget::add()
 {
     // so that the base class doesn't complain there is no icon defined
-    m_properties[PROP_ICON]="gui/main_help.png";
+    m_properties[PROP_ICON]="gui/icons/main_help.png";
 
     IconButtonWidget::add();
 
diff --git a/src/guiengine/widgets/player_name_spinner.cpp b/src/guiengine/widgets/player_name_spinner.cpp
index 93fbbf26f..178ca0562 100644
--- a/src/guiengine/widgets/player_name_spinner.cpp
+++ b/src/guiengine/widgets/player_name_spinner.cpp
@@ -48,7 +48,7 @@ void PlayerNameSpinner::markAsIncorrect()
 
     m_incorrect = true;
 
-    irr::video::ITexture* texture = irr_driver->getTexture(FileManager::GUI,
+    irr::video::ITexture* texture = irr_driver->getTexture(FileManager::GUI_ICON,
                                                            "red_mark.png"   );
     const int mark_size = m_h;
     const int mark_x = m_w - mark_size*2;
diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index 25f73f161..caaa99642 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -410,11 +410,11 @@ void RibbonWidget::add()
                 irr_driver->getTexture((filename).c_str());
             if(!image)
             {
-                std::string file = file_manager->getAsset(FileManager::GUI,"main_help.png");
+                std::string file = file_manager->getAsset(FileManager::GUI_ICON,"main_help.png");
                 image = irr_driver->getTexture(file);
                 if(!image)
                     Log::fatal("RibbonWidget",
-                        "Can't find fallback texture 'gui/main_help.png, aborting.");
+                        "Can't find fallback texture 'gui/icons/main_help.png, aborting.");
             }
 
             float image_h = (float)image->getSize().Height;
diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index 5fcc09db2..a582261e4 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -124,7 +124,9 @@ FileManager::FileManager()
     m_subdir_name[CHALLENGE  ] = "challenges";
     m_subdir_name[GFX        ] = "gfx";
     m_subdir_name[GRANDPRIX  ] = "grandprix";
-    m_subdir_name[GUI        ] = "gui";
+    m_subdir_name[GUI_ICON   ] = "gui/icons";
+    m_subdir_name[GUI_SCREEN ] = "gui/screens";
+    m_subdir_name[GUI_DIALOG ] = "gui/dialogs";
     m_subdir_name[LIBRARY    ] = "library";
     m_subdir_name[MODEL      ] = "models";
     m_subdir_name[MUSIC      ] = "music";
@@ -333,7 +335,7 @@ void FileManager::init()
     if (fileExists(m_subdir_name[TEXTURE]+"deprecated/"))
         pushTextureSearchPath(m_subdir_name[TEXTURE]+"deprecated/", "deprecatedtex");
 
-    pushTextureSearchPath(m_subdir_name[GUI], "gui");
+    pushTextureSearchPath(m_subdir_name[GUI_ICON], "gui/icons");
 
     pushModelSearchPath  (m_subdir_name[MODEL]);
     pushMusicSearchPath  (m_subdir_name[MUSIC]);
diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp
index 8084e50b3..db280d769 100644
--- a/src/io/file_manager.hpp
+++ b/src/io/file_manager.hpp
@@ -59,7 +59,8 @@ public:
      *  The last entry ASSET_COUNT specifies the number of entries. */
     enum AssetType {ASSET_MIN,
                     CHALLENGE=ASSET_MIN,
-                    GFX, GRANDPRIX, GUI, LIBRARY, MODEL, MUSIC, REPLAY,
+                    GFX, GRANDPRIX, GUI_ICON, GUI_SCREEN, GUI_DIALOG,
+                    LIBRARY, MODEL, MUSIC, REPLAY,
                     SCRIPT, SFX, SHADER, SKIN, TEXTURE, TTF,
                     TRANSLATION, ASSET_MAX = TRANSLATION,
                     ASSET_COUNT};
diff --git a/src/main.cpp b/src/main.cpp
index 1f29c20fb..b5848efc7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1697,14 +1697,14 @@ void initRest()
     track_manager->loadTrackList();
     music_manager->addMusicToTracks();
 
-    GUIEngine::addLoadingIcon(irr_driver->getTexture(FileManager::GUI,
+    GUIEngine::addLoadingIcon(irr_driver->getTexture(FileManager::GUI_ICON,
                                                      "notes.png"      ) );
 
     grand_prix_manager      = new GrandPrixManager     ();
     // Consistency check for challenges, and enable all challenges
     // that have all prerequisites fulfilled
     grand_prix_manager->checkConsistency();
-    GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
+    GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI_ICON,
                                                       "cup_gold.png"    ) );
 
     race_manager            = new RaceManager          ();
@@ -1923,7 +1923,7 @@ int main(int argc, char *argv[] )
         // Preload the explosion effects (explode.png)
         ParticleKindManager::get()->getParticles("explosion.xml");
 
-        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
+        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "options_video.png"));
         kart_properties_manager -> loadAllKarts    ();
         handleXmasMode();
@@ -1940,7 +1940,7 @@ int main(int argc, char *argv[] )
         // to initialise the AchievementsStatus, so it is done only now.
         PlayerManager::get()->initRemainingData();
 
-        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
+        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "gui_lock.png"  ) );
         projectile_manager->loadData();
 
@@ -1963,13 +1963,13 @@ int main(int argc, char *argv[] )
         powerup_manager->loadPowerupsModels();
         ItemManager::loadDefaultItemMeshes();
 
-        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
+        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "gift.png")       );
 
         attachment_manager->loadModels();
         file_manager->popTextureSearchPath();
 
-        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
+        GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI_ICON,
                                                           "banana.png")    );
 
         //handleCmdLine() needs InitTuxkart() so it can't be called first
diff --git a/src/modes/capture_the_flag.cpp b/src/modes/capture_the_flag.cpp
index d81a9b49c..897f5b7ab 100644
--- a/src/modes/capture_the_flag.cpp
+++ b/src/modes/capture_the_flag.cpp
@@ -90,9 +90,9 @@ void CaptureTheFlag::init()
     assert(m_blue_flag_node);
 
     std::string red_path =
-        file_manager->getAsset(FileManager::GUI, "red_arrow.png");
+        file_manager->getAsset(FileManager::GUI_ICON, "red_arrow.png");
     std::string blue_path =
-        file_manager->getAsset(FileManager::GUI, "blue_arrow.png");
+        file_manager->getAsset(FileManager::GUI_ICON, "blue_arrow.png");
 
     m_red_flag_indicator = irr_driver->addBillboard(
             core::dimension2df(1.5f, 1.5f), red_path, NULL);
diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp
index 121f05cb9..9cd2d726d 100644
--- a/src/modes/three_strikes_battle.cpp
+++ b/src/modes/three_strikes_battle.cpp
@@ -179,7 +179,7 @@ void ThreeStrikesBattle::kartAdded(AbstractKart* kart, scene::ISceneNode* node)
     {
         // Add heart billboard above it
         std::string heart_path =
-            file_manager->getAsset(FileManager::GUI, "heart.png");
+            file_manager->getAsset(FileManager::GUI_ICON, "heart.png");
         float height = kart->getKartHeight() + 0.5f;
 
         scene::ISceneNode* billboard = irr_driver->addBillboard
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 07de4475f..285955cb7 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -1524,9 +1524,9 @@ void World::initTeamArrows()
 
     //Loading the indicator textures
     std::string red_path =
-            file_manager->getAsset(FileManager::GUI, "red_arrow.png");
+            file_manager->getAsset(FileManager::GUI_ICON, "red_arrow.png");
     std::string blue_path =
-            file_manager->getAsset(FileManager::GUI, "blue_arrow.png");
+            file_manager->getAsset(FileManager::GUI_ICON, "blue_arrow.png");
 
     //Assigning indicators
     for(unsigned int i = 0; i < kart_amount; i++)
diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index 0e512dda1..9982d2f91 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -158,12 +158,12 @@ public:
     {
         switch (mode)
         {
-            case MINOR_MODE_NORMAL_RACE:    return "/gui/mode_normal.png";
-            case MINOR_MODE_TIME_TRIAL:     return "/gui/mode_tt.png";
-            case MINOR_MODE_FOLLOW_LEADER:  return "/gui/mode_ftl.png";
-            case MINOR_MODE_BATTLE:      return "/gui/mode_3strikes.png";
-            case MINOR_MODE_EASTER_EGG:     return "/gui/mode_easter.png";
-            case MINOR_MODE_SOCCER:         return "/gui/mode_soccer.png";
+            case MINOR_MODE_NORMAL_RACE:    return "/gui/icons/mode_normal.png";
+            case MINOR_MODE_TIME_TRIAL:     return "/gui/icons/mode_tt.png";
+            case MINOR_MODE_FOLLOW_LEADER:  return "/gui/icons/mode_ftl.png";
+            case MINOR_MODE_BATTLE:      return "/gui/icons/mode_3strikes.png";
+            case MINOR_MODE_EASTER_EGG:     return "/gui/icons/mode_easter.png";
+            case MINOR_MODE_SOCCER:         return "/gui/icons/mode_soccer.png";
             default: assert(false); return NULL;
         }
     }   // getIconOf
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 0a2158422..3f6a1b79a 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -70,17 +70,17 @@ AddonsScreen::AddonsScreen() : Screen("addons_screen.stkgui")
 
 void AddonsScreen::loadedFromFile()
 {
-    video::ITexture* icon1 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* icon1 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                      "package.png"         ));
-    video::ITexture* icon2 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* icon2 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                      "no-package.png"      ));
-    video::ITexture* icon3 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* icon3 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                      "package-update.png"  ));
-    video::ITexture* icon4 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* icon4 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                      "package-featured.png"));
-    video::ITexture* icon5 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* icon5 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                   "no-package-featured.png"));
-    video::ITexture* icon6 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* icon6 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                      "loading.png"));
 
     m_icon_bank = new irr::gui::STKModifiedSpriteBank( GUIEngine::getGUIEnv());
diff --git a/src/states_screens/arenas_screen.cpp b/src/states_screens/arenas_screen.cpp
index 3c9072148..1ea35dc97 100644
--- a/src/states_screens/arenas_screen.cpp
+++ b/src/states_screens/arenas_screen.cpp
@@ -334,7 +334,7 @@ void ArenasScreen::buildTrackList()
     }
     if (arenas_have_navmesh || race_manager->getNumLocalPlayers() > 1 ||
         UserConfigParams::m_artist_debug_mode)
-        w->addItem(_("Random Arena"), "random_track", "/gui/track_random.png");
+        w->addItem(_("Random Arena"), "random_track", "/gui/icons/track_random.png");
     w->updateItemDisplay();
 
     if (m_unsupported_arena.size() > 0)
diff --git a/src/states_screens/dialogs/ghost_replay_info_dialog.cpp b/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
index 8f722da33..e8a243121 100644
--- a/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
+++ b/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
@@ -55,7 +55,7 @@ GhostReplayInfoDialog::GhostReplayInfoDialog(unsigned int replay_id,
     m_track_screenshot_widget->m_tab_stop = false;
 
     // temporary icon, will replace it just after (but it will be shown if the given icon is not found)
-    m_track_screenshot_widget->m_properties[PROP_ICON] = "gui/main_help.png";
+    m_track_screenshot_widget->m_properties[PROP_ICON] = "gui/icons/main_help.png";
 
     irr::video::ITexture* image = STKTexManager::getInstance()
         ->getTexture(track->getScreenshotFile(),
diff --git a/src/states_screens/dialogs/network_user_dialog.cpp b/src/states_screens/dialogs/network_user_dialog.cpp
index ab7abaec4..689328756 100644
--- a/src/states_screens/dialogs/network_user_dialog.cpp
+++ b/src/states_screens/dialogs/network_user_dialog.cpp
@@ -98,7 +98,7 @@ void NetworkUserDialog::beforeAddingWidgets()
         m_change_team_widget->setVisible(true);
         //I18N: In the network user dialog
         m_change_team_widget->setText(_("Change team"));
-        m_change_team_widget->setImage(file_manager->getAsset(FileManager::GUI,
+        m_change_team_widget->setImage(file_manager->getAsset(FileManager::GUI_ICON,
             "race_giveup.png"), IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
     }
     else
diff --git a/src/states_screens/dialogs/select_challenge.cpp b/src/states_screens/dialogs/select_challenge.cpp
index ed3f09e9d..1aab46d3a 100644
--- a/src/states_screens/dialogs/select_challenge.cpp
+++ b/src/states_screens/dialogs/select_challenge.cpp
@@ -169,7 +169,7 @@ void SelectChallengeDialog::updateSolvedIcon(const ChallengeStatus* c, RaceManag
     if (c->isSolved(diff))
     {
         IconButtonWidget* btn = getWidget<IconButtonWidget>(widget_name);
-        btn->setImage(file_manager->getAsset(FileManager::GUI, path),
+        btn->setImage(file_manager->getAsset(FileManager::GUI_ICON, path),
                      IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
     }
 } //updateSolvedIcon
diff --git a/src/states_screens/easter_egg_screen.cpp b/src/states_screens/easter_egg_screen.cpp
index 6460d53bc..91f0d65bd 100644
--- a/src/states_screens/easter_egg_screen.cpp
+++ b/src/states_screens/easter_egg_screen.cpp
@@ -266,7 +266,7 @@ void EasterEggScreen::buildTrackList()
         }
     }
 
-    tracks_widget->addItem(_("Random Track"), "random_track", "/gui/track_random.png",
+    tracks_widget->addItem(_("Random Track"), "random_track", "/gui/icons/track_random.png",
                            0 /* no badge */, IconButtonWidget::ICON_PATH_TYPE_RELATIVE);
 
     tracks_widget->updateItemDisplay();
diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp
index 490dfd6fb..0e917eb27 100644
--- a/src/states_screens/edit_gp_screen.cpp
+++ b/src/states_screens/edit_gp_screen.cpp
@@ -242,7 +242,7 @@ void EditGPScreen::loadList(const int selected)
         if (screenShot == NULL)
         {
             screenShot = irr_driver->getTexture(
-                file_manager->getAsset(FileManager::GUI, "main_help.png"));
+                file_manager->getAsset(FileManager::GUI_ICON, "main_help.png"));
         }
         assert (screenShot != NULL);
         m_icons.push_back(m_icon_bank->addTextureAsSprite(screenShot));
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index ea132addb..323e74a8a 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -318,7 +318,7 @@ void FeatureUnlockedCutScene::addUnlockedPicture(irr::video::ITexture* picture,
                   "Unlockable has no picture: %s",
                   core::stringc(msg.c_str()).c_str());
         picture = irr_driver->getTexture(
-                     file_manager->getAsset(FileManager::GUI,"main_help.png"));
+                     file_manager->getAsset(FileManager::GUI_ICON,"main_help.png"));
 
     }
 
@@ -672,7 +672,7 @@ void FeatureUnlockedCutScene::addUnlockedGP(const GrandPrixData* gp)
         Log::error("FeatureUnlockedCutScene::addUnlockedGP",
                    "Unlocked GP does not exist");
         const std::string t_name =
-            file_manager->getAsset(FileManager::GUI, "main_help.png");
+            file_manager->getAsset(FileManager::GUI_ICON, "main_help.png");
         video::ITexture* WTF_image = irr_driver->getTexture(t_name);
         images.push_back(WTF_image);
     }
@@ -687,7 +687,7 @@ void FeatureUnlockedCutScene::addUnlockedGP(const GrandPrixData* gp)
                        "Unlocked GP is empty");
             video::ITexture* WTF_image =
                 irr_driver->getTexture( file_manager
-                                        ->getAsset(FileManager::GUI,"main_help.png"));
+                                        ->getAsset(FileManager::GUI_ICON,"main_help.png"));
             images.push_back(WTF_image);
         }
 
@@ -697,7 +697,7 @@ void FeatureUnlockedCutScene::addUnlockedGP(const GrandPrixData* gp)
 
             const std::string t_name = 
                 track ? track->getScreenshotFile()
-                      : file_manager->getAsset(FileManager::GUI, "main_help.png");
+                      : file_manager->getAsset(FileManager::GUI_ICON, "main_help.png");
             ITexture* tex = irr_driver->getTexture(t_name);
             images.push_back(tex);
         }
diff --git a/src/states_screens/ghost_replay_selection.cpp b/src/states_screens/ghost_replay_selection.cpp
index 100d49a0a..142935cdc 100644
--- a/src/states_screens/ghost_replay_selection.cpp
+++ b/src/states_screens/ghost_replay_selection.cpp
@@ -155,7 +155,7 @@ void GhostReplaySelection::init()
         m_icon_bank->addTextureAsSprite(prop->getIconMaterial()->getTexture());
     }
 
-    video::ITexture* kart_not_found = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,
+    video::ITexture* kart_not_found = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,
                                                               "main_help.png"         ));
 
     m_icon_unknown_kart = m_icon_bank->addTextureAsSprite(kart_not_found);
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 1fbb3775a..5b0c42fa4 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -175,7 +175,7 @@ void GPInfoScreen::init()
     {
         RibbonWidget *rb = getWidget<RibbonWidget>("buttons");
         rb->setLabel(1,_(L"Reload") );
-        std::string restart = file_manager->getAsset(FileManager::GUI, "restart.png");
+        std::string restart = file_manager->getAsset(FileManager::GUI_ICON, "restart.png");
 
         // We have to recreate the group spinner, but a new group might have
         // been added or deleted since the last time this screen was shown.
@@ -282,7 +282,7 @@ void GPInfoScreen::addScreenshot()
 
     // Temporary icon, will replace it just after
     // (but it will be shown if the given icon is not found)
-    screenshot->m_properties[PROP_ICON] = "gui/main_help.png";
+    screenshot->m_properties[PROP_ICON] = "gui/icons/main_help.png";
 
     const Track *track = track_manager->getTrack(m_gp.getTrackId(0));
     video::ITexture* image = STKTexManager::getInstance()
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 0043a4629..8d6f71bcd 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -238,7 +238,7 @@ void GrandPrixEditorScreen::loadGPList()
             sshot_files.push_back(track->getScreenshotFile());
         }
         if (sshot_files.empty())
-            sshot_files.push_back(file_manager->getAsset(FileManager::GUI,"main_help.png"));
+            sshot_files.push_back(file_manager->getAsset(FileManager::GUI_ICON,"main_help.png"));
 
         if (m_gpgroup == GrandPrixData::GP_NONE || m_gpgroup == gp->getGroup())
         {
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index ef182922f..4267df015 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -175,7 +175,7 @@ void GrandPrixWin::init()
         core::rect< s32 > iconarea(label_x_from - label_height, y_from,
                                    label_x_from,                y_to);
         IGUIImage* img = GUIEngine::getGUIEnv()->addImage( iconarea );
-        img->setImage( irr_driver->getTexture( FileManager::GUI, "cup_gold.png") );
+        img->setImage( irr_driver->getTexture( FileManager::GUI_ICON, "cup_gold.png") );
         img->setScaleImage(true);
         img->setTabStop(false);
         img->setUseAlphaChannel(true);
@@ -183,7 +183,7 @@ void GrandPrixWin::init()
         core::rect< s32 > icon2area(label_x_to,                y_from,
                                     label_x_to + label_height, y_to);
         img = GUIEngine::getGUIEnv()->addImage( icon2area );
-        img->setImage( irr_driver->getTexture( FileManager::GUI,"cup_gold.png") );
+        img->setImage( irr_driver->getTexture( FileManager::GUI_ICON,"cup_gold.png") );
         img->setScaleImage(true);
         img->setTabStop(false);
         img->setUseAlphaChannel(true);
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 6c298aa7e..ad5b088c4 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -1521,7 +1521,7 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
     // add random
     if (usable_kart_count > 1)
     {
-        w->addItem(_("Random Kart"), RANDOM_KART_ID, "/gui/random_kart.png");
+        w->addItem(_("Random Kart"), RANDOM_KART_ID, "/gui/icons/random_kart.png");
     }
 
     w->updateItemDisplay();
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 727ea146f..3fcf05b04 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -164,7 +164,7 @@ void MainMenuScreen::init()
     DemoWorld::resetIdleTime();
 
 #if _IRR_MATERIAL_MAX_TEXTURES_ < 8
-    getWidget<IconButtonWidget>("logo")->setImage("gui/logo_broken.png",
+    getWidget<IconButtonWidget>("logo")->setImage("gui/icons/logo_broken.png",
         IconButtonWidget::ICON_PATH_TYPE_RELATIVE);
 #endif
 
diff --git a/src/states_screens/network_kart_selection.cpp b/src/states_screens/network_kart_selection.cpp
index a517e5075..ebb3cb133 100644
--- a/src/states_screens/network_kart_selection.cpp
+++ b/src/states_screens/network_kart_selection.cpp
@@ -36,7 +36,7 @@ void NetworkKartSelectionScreen::init()
 
     // change the back button image (because it makes the game quit)
     IconButtonWidget* back_button = getWidget<IconButtonWidget>("back");
-    back_button->setImage("gui/main_quit.png");
+    back_button->setImage("gui/icons/main_quit.png");
 
     DynamicRibbonWidget* w = getWidget<DynamicRibbonWidget>("karts");
     assert(w != NULL);
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index 448781a75..8169678df 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -110,13 +110,13 @@ void NetworkingLobby::loadedFromFile()
 
     m_icon_bank = new irr::gui::STKModifiedSpriteBank(GUIEngine::getGUIEnv());
     video::ITexture* icon_1 = irr_driver->getTexture
-        (file_manager->getAsset(FileManager::GUI, "crown.png"));
+        (file_manager->getAsset(FileManager::GUI_ICON, "crown.png"));
     video::ITexture* icon_2 = irr_driver->getTexture
-        (file_manager->getAsset(FileManager::GUI, "difficulty_medium.png"));
+        (file_manager->getAsset(FileManager::GUI_ICON, "difficulty_medium.png"));
     video::ITexture* icon_3 = irr_driver->getTexture
-        (file_manager->getAsset(FileManager::GUI, "main_help.png"));
+        (file_manager->getAsset(FileManager::GUI_ICON, "main_help.png"));
     video::ITexture* icon_4 = irr_driver->getTexture
-        (file_manager->getAsset(FileManager::GUI, "hourglass.png"));
+        (file_manager->getAsset(FileManager::GUI_ICON, "hourglass.png"));
     m_icon_bank->addTextureAsSprite(icon_1);
     m_icon_bank->addTextureAsSprite(icon_2);
     m_icon_bank->addTextureAsSprite(icon_3);
diff --git a/src/states_screens/options_screen_input.cpp b/src/states_screens/options_screen_input.cpp
index 55e1864ec..e015ed9ef 100644
--- a/src/states_screens/options_screen_input.cpp
+++ b/src/states_screens/options_screen_input.cpp
@@ -57,9 +57,9 @@ OptionsScreenInput::OptionsScreenInput() : Screen("options_input.stkgui")
 
 void OptionsScreenInput::loadedFromFile()
 {
-    video::ITexture* icon1 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,"keyboard.png"   ));
-    video::ITexture* icon2 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,"gamepad.png"    ));
-    video::ITexture* icon3 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI,"gamepad_off.png"));
+    video::ITexture* icon1 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"keyboard.png"   ));
+    video::ITexture* icon2 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"gamepad.png"    ));
+    video::ITexture* icon3 = irr_driver->getTexture( file_manager->getAsset(FileManager::GUI_ICON,"gamepad_off.png"));
 
     m_icon_bank = new irr::gui::STKModifiedSpriteBank( GUIEngine::getGUIEnv() );
     m_icon_bank->addTextureAsSprite(icon1);
diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp
index efa62f25c..b9dbae529 100644
--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -326,19 +326,19 @@ void OptionsScreenVideo::init()
 #define ABOUT_EQUAL(a , b) (fabsf( a - b ) < 0.01)
 
             if      (ABOUT_EQUAL( ratio, (5.0f/4.0f) ))
-                res->addItem(label, name, "/gui/screen54.png");
+                res->addItem(label, name, "/gui/icons/screen54.png");
             else if (ABOUT_EQUAL( ratio, (4.0f/3.0f) ))
-                res->addItem(label, name, "/gui/screen43.png");
+                res->addItem(label, name, "/gui/icons/screen43.png");
             else if (ABOUT_EQUAL( ratio, (16.0f/10.0f)))
-                res->addItem(label, name, "/gui/screen1610.png");
+                res->addItem(label, name, "/gui/icons/screen1610.png");
             else if (ABOUT_EQUAL( ratio, (5.0f/3.0f) ))
-                res->addItem(label, name, "/gui/screen53.png");
+                res->addItem(label, name, "/gui/icons/screen53.png");
             else if (ABOUT_EQUAL( ratio, (3.0f/2.0f) ))
-                res->addItem(label, name, "/gui/screen32.png");
+                res->addItem(label, name, "/gui/icons/screen32.png");
             else if (ABOUT_EQUAL( ratio, (16.0f/9.0f) ))
-                res->addItem(label, name, "/gui/screen169.png");
+                res->addItem(label, name, "/gui/icons/screen169.png");
             else
-                res->addItem(label, name, "/gui/screen_other.png");
+                res->addItem(label, name, "/gui/icons/screen_other.png");
 #undef ABOUT_EQUAL
         } // add next resolution
     } // end if not inited
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 1e9969fda..b05fefee4 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -324,9 +324,9 @@ void RaceGUI::drawScores()
     static video::SColor color = video::SColor(255,255,255,255);
 
     //Draw two teams score
-    irr::video::ITexture *red_team = irr_driver->getTexture(FileManager::GUI,
+    irr::video::ITexture *red_team = irr_driver->getTexture(FileManager::GUI_ICON,
                                                             "soccer_ball_red.png");
-    irr::video::ITexture *blue_team = irr_driver->getTexture(FileManager::GUI,
+    irr::video::ITexture *blue_team = irr_driver->getTexture(FileManager::GUI_ICON,
                                                             "soccer_ball_blue.png");
     irr::video::ITexture *team_icon = red_team;
 
@@ -518,7 +518,7 @@ void RaceGUI::drawGlobalMiniMap()
     {
         Vec3 draw_at;
         video::ITexture* icon =
-            irr_driver->getTexture(FileManager::GUI, "red_flag.png");
+            irr_driver->getTexture(FileManager::GUI_ICON, "red_flag.png");
         if (!ctf->isRedFlagInBase())
         {
             track->mapPoint2MiniMap(Track::getCurrentTrack()->getRedFlag().getOrigin(),
@@ -539,7 +539,7 @@ void RaceGUI::drawGlobalMiniMap()
                                  lower_y   -(int)(draw_at.getY()-(m_minimap_player_size/2.2f)));
         draw2DImage(icon, rp, rs, NULL, NULL, true);
 
-        icon = irr_driver->getTexture(FileManager::GUI, "blue_flag.png");
+        icon = irr_driver->getTexture(FileManager::GUI_ICON, "blue_flag.png");
         if (!ctf->isBlueFlagInBase())
         {
             track->mapPoint2MiniMap(Track::getCurrentTrack()->getBlueFlag().getOrigin(),
@@ -573,7 +573,7 @@ void RaceGUI::drawGlobalMiniMap()
         track->mapPoint2MiniMap(xyz, &draw_at);
 
         video::ITexture* icon = sta ?
-            irr_driver->getTexture(FileManager::GUI, "heart.png") :
+            irr_driver->getTexture(FileManager::GUI_ICON, "heart.png") :
             kart->getKartProperties()->getMinimapIcon();
         if (icon == NULL)
         {
@@ -615,7 +615,7 @@ void RaceGUI::drawGlobalMiniMap()
         track->mapPoint2MiniMap(sw->getBallPosition(), &draw_at);
         
         video::ITexture* icon =
-            irr_driver->getTexture(FileManager::GUI, "soccer_ball_normal.png");
+            irr_driver->getTexture(FileManager::GUI_ICON, "soccer_ball_normal.png");
 
         core::rect<s32> source(core::position2di(0, 0), icon->getSize());
         core::rect<s32> position(m_map_left+(int)(draw_at.getX()-(m_minimap_player_size/2.5f)),
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 4a2823763..06dfddca3 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -95,10 +95,10 @@ RaceGUIBase::RaceGUIBase()
                    "Can't find 'icons-frame.png' texture, aborting.");
     }
 
-    m_gauge_full            = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"gauge_full.png"));
-    m_gauge_full_bright     = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"gauge_full_bright.png"));
-    m_gauge_empty           = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"gauge_empty.png"));
-    m_gauge_goal            = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"gauge_goal.png" ));
+    m_gauge_full            = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI_ICON,"gauge_full.png"));
+    m_gauge_full_bright     = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI_ICON,"gauge_full_bright.png"));
+    m_gauge_empty           = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI_ICON,"gauge_empty.png"));
+    m_gauge_goal            = irr_driver->getTexture(file_manager->getAsset(FileManager::GUI_ICON,"gauge_goal.png" ));
     m_dist_show_overlap     = 2;
     m_icons_inertia         = 2;
 
@@ -900,7 +900,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             if (ctf->getRedHolder() == (int)kart_id)
             {
                 video::ITexture* red =
-                    irr_driver->getTexture(FileManager::GUI, "red_flag.png");
+                    irr_driver->getTexture(FileManager::GUI_ICON, "red_flag.png");
                 const core::rect<s32> rect(core::position2d<s32>(0, 0),
                     red->getSize());
                 const core::rect<s32> pos1
@@ -910,7 +910,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             else if (ctf->getBlueHolder() == (int)kart_id)
             {
                 video::ITexture* blue =
-                    irr_driver->getTexture(FileManager::GUI, "blue_flag.png");
+                    irr_driver->getTexture(FileManager::GUI_ICON, "blue_flag.png");
                 const core::rect<s32> rect(core::position2d<s32>(0, 0),
                     blue->getSize());
                 const core::rect<s32> pos1
diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp
index 9d8d5bdfe..abb432d60 100644
--- a/src/states_screens/race_gui_multitouch.cpp
+++ b/src/states_screens/race_gui_multitouch.cpp
@@ -187,24 +187,24 @@ void RaceGUIMultitouch::init()
                         int(first_column_x), int(h - 1 * col_size),
                         int(btn_size), int(btn_size));
                       
-    m_steering_wheel_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_steering_wheel_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                                   "android/steering_wheel.png");
-    m_up_down_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_up_down_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                                          "android/up_down.png");
-    m_pause_tex = irr_driver->getTexture(FileManager::GUI, "android/pause.png");
-    m_nitro_tex = irr_driver->getTexture(FileManager::GUI, "android/nitro.png");
-    m_nitro_empty_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_pause_tex = irr_driver->getTexture(FileManager::GUI_ICON, "android/pause.png");
+    m_nitro_tex = irr_driver->getTexture(FileManager::GUI_ICON, "android/nitro.png");
+    m_nitro_empty_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                                      "android/nitro_empty.png");
-    m_wing_mirror_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_wing_mirror_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                                      "android/wing_mirror.png");
-    m_thunderbird_reset_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_thunderbird_reset_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                                "android/thunderbird_reset.png");
-    m_drift_tex = irr_driver->getTexture(FileManager::GUI, "android/drift.png");
-    m_bg_button_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_drift_tex = irr_driver->getTexture(FileManager::GUI_ICON, "android/drift.png");
+    m_bg_button_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                                   "android/blur_bg_button.png");
-    m_bg_button_focus_tex = irr_driver->getTexture(FileManager::GUI, 
+    m_bg_button_focus_tex = irr_driver->getTexture(FileManager::GUI_ICON, 
                                             "android/blur_bg_button_focus.png");
-    m_gui_action_tex = irr_driver->getTexture(FileManager::GUI,"challenge.png");
+    m_gui_action_tex = irr_driver->getTexture(FileManager::GUI_ICON,"challenge.png");
 
 } // init
 
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index 35ff7d434..a99b8ab46 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -81,10 +81,10 @@ RaceGUIOverworld::RaceGUIOverworld()
     m_is_first_render_call = true;
     m_close_to_a_challenge = false;
     m_current_challenge = NULL;
-    m_trophy1 = irr_driver->getTexture(FileManager::GUI, "cup_bronze.png");
-    m_trophy2 = irr_driver->getTexture(FileManager::GUI, "cup_silver.png");
-    m_trophy3 = irr_driver->getTexture(FileManager::GUI, "cup_gold.png"  );
-    m_trophy4 = irr_driver->getTexture(FileManager::GUI, "cup_platinum.png"  );
+    m_trophy1 = irr_driver->getTexture(FileManager::GUI_ICON, "cup_bronze.png");
+    m_trophy2 = irr_driver->getTexture(FileManager::GUI_ICON, "cup_silver.png");
+    m_trophy3 = irr_driver->getTexture(FileManager::GUI_ICON, "cup_gold.png"  );
+    m_trophy4 = irr_driver->getTexture(FileManager::GUI_ICON, "cup_platinum.png"  );
 
     float scaling = irr_driver->getFrameSize().Height / 420.0f;
     const float map_size = 250.0f;
@@ -153,9 +153,9 @@ RaceGUIOverworld::RaceGUIOverworld()
     gui::ScalableFont* font = GUIEngine::getFont();
     m_trophy_points_width = font->getDimension(L"1000").Width;
 
-    m_lock           = irr_driver->getTexture(FileManager::GUI,"gui_lock.png");
-    m_open_challenge = irr_driver->getTexture(FileManager::GUI,"challenge.png");
-    m_locked_bonus   = irr_driver->getTexture(FileManager::GUI,"mystery_unlock.png");
+    m_lock           = irr_driver->getTexture(FileManager::GUI_ICON,"gui_lock.png");
+    m_open_challenge = irr_driver->getTexture(FileManager::GUI_ICON,"challenge.png");
+    m_locked_bonus   = irr_driver->getTexture(FileManager::GUI_ICON,"mystery_unlock.png");
 
     m_icons[0] = m_lock;
     m_icons[1] = m_open_challenge;
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 2b336d914..75068e0d2 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -508,9 +508,9 @@ void RaceResultGUI::displayCTFResults()
     //Draw team scores:
     current_y += rect.Height;
     current_x /= 2;
-    irr::video::ITexture* red_icon = irr_driver->getTexture(FileManager::GUI,
+    irr::video::ITexture* red_icon = irr_driver->getTexture(FileManager::GUI_ICON,
         "red_flag.png");
-    irr::video::ITexture* blue_icon = irr_driver->getTexture(FileManager::GUI,
+    irr::video::ITexture* blue_icon = irr_driver->getTexture(FileManager::GUI_ICON,
         "blue_flag.png");
 
     core::recti source_rect(core::vector2di(0, 0), red_icon->getSize());
@@ -1247,9 +1247,9 @@ void RaceResultGUI::displayCTFResults()
         //Draw team scores:
         current_y += rect.Height;
         current_x /= 2;
-        irr::video::ITexture* red_icon = irr_driver->getTexture(FileManager::GUI,
+        irr::video::ITexture* red_icon = irr_driver->getTexture(FileManager::GUI_ICON,
             "soccer_ball_red.png");
-        irr::video::ITexture* blue_icon = irr_driver->getTexture(FileManager::GUI,
+        irr::video::ITexture* blue_icon = irr_driver->getTexture(FileManager::GUI_ICON,
             "soccer_ball_blue.png");
 
         core::recti source_rect(core::vector2di(0, 0), red_icon->getSize());
@@ -1438,7 +1438,7 @@ void RaceResultGUI::displayCTFResults()
             up_button->m_w = w;
             up_button->m_h = font_height;
             up_button->add();
-            up_button->setImage(file_manager->getAsset(FileManager::GUI, "scroll_up.png"));
+            up_button->setImage(file_manager->getAsset(FileManager::GUI_ICON, "scroll_up.png"));
             addGPProgressWidget(up_button);
             y = (up_button->m_y + up_button->m_h + SSHOT_SEPARATION);
 
@@ -1490,7 +1490,7 @@ void RaceResultGUI::displayCTFResults()
             down_button->m_w = w;
             down_button->m_h = font_height;
             down_button->add();
-            down_button->setImage(file_manager->getAsset(FileManager::GUI, "scroll_down.png"));
+            down_button->setImage(file_manager->getAsset(FileManager::GUI_ICON, "scroll_down.png"));
             addGPProgressWidget(down_button);
 
         }   // if MAJOR_MODE_GRAND_PRIX)
@@ -1676,7 +1676,7 @@ void RaceResultGUI::displayCTFResults()
             // Network grand prix chooses each track 1 by 1
             if (track == NULL)
             {
-                sshot->setImage(file_manager->getAsset(FileManager::GUI,
+                sshot->setImage(file_manager->getAsset(FileManager::GUI_ICON,
                     "main_help.png"));
             }
             else
diff --git a/src/states_screens/race_setup_screen.cpp b/src/states_screens/race_setup_screen.cpp
index cf013c593..b99df23ba 100644
--- a/src/states_screens/race_setup_screen.cpp
+++ b/src/states_screens/race_setup_screen.cpp
@@ -135,7 +135,7 @@ void RaceSetupScreen::init()
 
     irr::core::stringw name6 = irr::core::stringw( _("Ghost replay race")) + L"\n";
     name6 += _("Race against ghost karts and try to beat them!");
-    w2->addItem( name6, IDENT_GHOST, "/gui/mode_ghost.png");
+    w2->addItem( name6, IDENT_GHOST, "/gui/icons/mode_ghost.png");
 
     w2->updateItemDisplay();
 
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 2f88b8ea1..d50e52dee 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -103,9 +103,9 @@ void ServerSelection::loadedFromFile()
     m_game_started->setState(false);
     m_icon_bank = new irr::gui::STKModifiedSpriteBank(GUIEngine::getGUIEnv());
     video::ITexture* icon1 = irr_driver->getTexture(
-        file_manager->getAsset(FileManager::GUI, "green_check.png"));
+        file_manager->getAsset(FileManager::GUI_ICON, "green_check.png"));
     video::ITexture* icon2 = irr_driver->getTexture(
-        file_manager->getAsset(FileManager::GUI, "hourglass.png"));
+        file_manager->getAsset(FileManager::GUI_ICON, "hourglass.png"));
     m_icon_bank->addTextureAsSprite(icon1);
     m_icon_bank->addTextureAsSprite(icon2);
 }   // loadedFromFile
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index 5713d2e6b..1953c99b9 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -124,7 +124,7 @@ void TrackInfoScreen::init()
     // images are saved squared, but must be stretched to 4:
 
     // temporary icon, will replace it just after (but it will be shown if the given icon is not found)
-    screenshot->m_properties[PROP_ICON] = "gui/main_help.png";
+    screenshot->m_properties[PROP_ICON] = "gui/icons/main_help.png";
 
     ITexture* image = STKTexManager::getInstance()
         ->getTexture(m_track->getScreenshotFile(),
@@ -333,7 +333,7 @@ void TrackInfoScreen::updateHighScores()
 
             ITexture* no_kart_texture =
                 STKTexManager::getInstance()->getTexture
-                (file_manager->getAsset(FileManager::GUI, "random_kart.png"));
+                (file_manager->getAsset(FileManager::GUI_ICON, "random_kart.png"));
             m_kart_icons[n]->setImage(no_kart_texture);
 
         }
diff --git a/src/states_screens/tracks_and_gp_screen.cpp b/src/states_screens/tracks_and_gp_screen.cpp
index 1f379c005..55f003806 100644
--- a/src/states_screens/tracks_and_gp_screen.cpp
+++ b/src/states_screens/tracks_and_gp_screen.cpp
@@ -205,7 +205,7 @@ void TracksAndGPScreen::init()
 
     // Random GP
     std::vector<std::string> screenshots;
-    screenshots.push_back(file_manager->getAsset(FileManager::GUI, "main_help.png"));
+    screenshots.push_back(file_manager->getAsset(FileManager::GUI_ICON, "main_help.png"));
     gps_widget->addAnimatedItem(translations->fribidize(GrandPrixData::getRandomGPName()),
                                 GrandPrixData::getRandomGPID(),
                                 screenshots, 1.5f, 0,
@@ -287,7 +287,7 @@ void TracksAndGPScreen::buildTrackList()
     }
 
     tracks_widget->addItem(_("Random Track"), "random_track",
-                           "/gui/track_random.png", 0 /* no badge */,
+                           "/gui/icons/track_random.png", 0 /* no badge */,
                            IconButtonWidget::ICON_PATH_TYPE_RELATIVE);
 
     tracks_widget->updateItemDisplay();
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 7054a71b9..b1864389c 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -223,12 +223,12 @@ void TracksScreen::init()
     if (m_network_tracks)
     {
         IconButtonWidget* back_button = getWidget<IconButtonWidget>("back");
-        back_button->setImage("gui/main_quit.png");
+        back_button->setImage("gui/icons/main_quit.png");
     }
     else
     {
         IconButtonWidget* back_button = getWidget<IconButtonWidget>("back");
-        back_button->setImage("gui/back.png");
+        back_button->setImage("gui/icons/back.png");
     }
 
     DynamicRibbonWidget* tracks_widget = getWidget<DynamicRibbonWidget>("tracks");
@@ -409,7 +409,7 @@ void TracksScreen::buildTrackList()
     }
 
     tracks_widget->addItem(_("Random Track"), "random_track",
-                           "/gui/track_random.png", 0 /* no badge */,
+                           "/gui/icons/track_random.png", 0 /* no badge */,
                            IconButtonWidget::ICON_PATH_TYPE_RELATIVE);
 
     tracks_widget->updateItemDisplay();