diff --git a/src/Gui/IconManager.cpp b/src/Gui/IconManager.cpp
index 798475150..a751f6670 100644
--- a/src/Gui/IconManager.cpp
+++ b/src/Gui/IconManager.cpp
@@ -117,10 +117,12 @@ void
 IconManager::assignIcon
 (const QString &field, const QString &value, const QString &filename)
 {
+    // Normalize Sport values
+    QString normValue = field == "Sport" ? RideFile::sportTag(value) : value;
     if (! filename.isEmpty()) {
-        icons[field][value] = filename;
+        icons[field][normValue] = filename;
     } else if (icons.contains(field)) {
-        icons[field].remove(value);
+        icons[field].remove(normValue);
     }
     saveConfig();
 }