diff --git a/data/gui/icons/licenses.txt b/data/gui/icons/licenses.txt
index 07adfb75d..bdef9de5f 100644
--- a/data/gui/icons/licenses.txt
+++ b/data/gui/icons/licenses.txt
@@ -14,6 +14,8 @@ Files:
  *.png
  back.png
  player.png
+ mode_3strikes.png
+ mode_weapons.png
 Copyright: SuperTuxKart dev team
 License: CC-BY-SA 3.0+
 Comment:
@@ -52,8 +54,59 @@ License: CC-BY-SA 3.0
 Comment: combination of main_network.png and blue_plus.png
 
 Files:
- mode_*.png
+ mode_ftl.png
+ mode_ghost.png
+ mode_normal.png
+ mode_soccer.png
  race_giveup.png
+Copyright: Totoplus62, SuperTuxKart dev team, ???
+License: CC-BY-SA 3.0
+Comment:
+ Original backgrounds come from set made by onyum.com (see above)
+ Backgrounds edited by Totoplus62
+ TODO: Source of ghost icon unknown
+ TODO: Check license of gift box model
+ TODO: Source of flag icon unknown
+
+Files:
+ mode_normal.png
+Copyright: Totoplus62, MiniBjorn, Marianne "Auria" Gagnon, SuperTuxKart dev team
+License: CC-BY-SA 3.0
+Comment:
+ Original backgrounds come from set made by onyum.com (see above)
+ Backgrounds edited by Totoplus62
+ Gift box model by MiniBjorn, with slight modifications by Marianne Gagnon
+
+Files:
+ mode_tt.png
+Copyright: Totoplus62, yeKcim, SuperTuxKart dev team
+License: CC-BY-SA 3.0
+Comment:
+ Original backgrounds come from set made by onyum.com (see above)
+ Backgrounds edited by Totoplus62
+ Clock icon from set by yeKcim
+
+Files:
+ mode_easter.png
+Copyright: Totoplus62, fraang, SuperTuxKart dev team
+License: CC-BY-SA 3.0
+Comment:
+ Original backgrounds come from set made by onyum.com (see above)
+ Backgrounds edited by Totoplus62
+ Eggs by fraang from https://opengameart.org/content/easter-egg
+ Rabbit and other bits by Totoplus62
+
+Files:
+ mode_laptrial.png
+Copyright: Totoplus62, yeKcim, Alina Oleynik, SuperTuxKart dev team
+License: CC-BY-SA 3.0
+Comment:
+ Original backgrounds come from set made by onyum.com (see above)
+ Backgrounds edited by Totoplus62
+ Clock icon from set by yeKcim
+ Flag is lap_flag.png by Alina Oleynik
+
+Files:
  tutorial.png
 Copyright: Totoplus62
 License: CC-BY-SA 3.0
@@ -158,10 +211,11 @@ License: CC-BY-SA 4
 
 Files:
  lap_flag.png
-Copyright: Alayan
-License: CC-BY-SA 3
+Copyright: Alina Oleynik
+License: CC BY 3.0
 Comment:
- original by Alina Oleynik from The Noun Project
+ "racing flag" icon by Alina Oleynik, from thenounproject.com
+ Source: https://thenounproject.com/icon/racing-flag-1298802/
 
 Files:
  robot.png
diff --git a/data/gui/icons/mode_laptrial.png b/data/gui/icons/mode_laptrial.png
new file mode 100644
index 000000000..129152890
Binary files /dev/null and b/data/gui/icons/mode_laptrial.png differ
diff --git a/data/gui/screens/help2.stkgui b/data/gui/screens/help2.stkgui
index 6f42f493b..60839fdb4 100644
--- a/data/gui/screens/help2.stkgui
+++ b/data/gui/screens/help2.stkgui
@@ -88,7 +88,7 @@
                 </div>
                 
                 <div width="100%" proportion="2" layout="horizontal-row">
-                    <icon align="center" width="8%" height="100%" icon="gui/icons/mode_normal.png"/>
+                    <icon align="center" width="8%" height="100%" icon="gui/icons/mode_laptrial.png"/>
                     <spacer width="3%" height="100%"/>
                     <bubble proportion="1" height="100%"
                             I18N="In the help menu"
diff --git a/data/gui/screens/high_score_selection.stkgui b/data/gui/screens/high_score_selection.stkgui
index 37a516abd..b9d86e630 100644
--- a/data/gui/screens/high_score_selection.stkgui
+++ b/data/gui/screens/high_score_selection.stkgui
@@ -22,7 +22,7 @@
                          I18N="In the high score selection screen" text="Time Trial"/>
             <icon-button id="tab_egg_hunt" width="128" height="128" icon="gui/icons/mode_easter.png"
                          I18N="In the high score selection screen" text="Egg Hunt"/>
-            <icon-button id="tab_lap_trial" width="128" height="128" icon="gui/icons/mode_normal.png"
+            <icon-button id="tab_lap_trial" width="128" height="128" icon="gui/icons/mode_laptrial.png"
                          I18N="In the high score selection screen" text="Lap Trial"/>
             <icon-button id="tab_grand_prix" width="128" height="128" icon="gui/icons/gp_new.png"
                          I18N="In the high score selection screen" text="Grand Prix"/>
diff --git a/data/skins/cartoon/data/gui/icons/mode_laptrial.png b/data/skins/cartoon/data/gui/icons/mode_laptrial.png
new file mode 100644
index 000000000..1d5cf88f5
Binary files /dev/null and b/data/skins/cartoon/data/gui/icons/mode_laptrial.png differ
diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index 63c39f0f6..6f02c873f 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -169,7 +169,7 @@ public:
             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_LAP_TRIAL:      return "/gui/icons/mode_normal.png"; // TODO: Add lap trial icon
+            case MINOR_MODE_LAP_TRIAL:      return "/gui/icons/mode_laptrial.png";
             case MINOR_MODE_3_STRIKES:      return "/gui/icons/mode_3strikes.png";
             case MINOR_MODE_FREE_FOR_ALL:   return "/gui/icons/mode_weapons.png";
             case MINOR_MODE_CAPTURE_THE_FLAG: return "/gui/icons/mode_weapons.png";