diff --git a/assets/datasets/question_catalog.json b/assets/datasets/question_catalog.json
index f5954257..d8380d4d 100644
--- a/assets/datasets/question_catalog.json
+++ b/assets/datasets/question_catalog.json
@@ -2666,28 +2666,28 @@
          "input": [
             {
                "name": "Bus",
-               "image": "assets/images/questions/mode_of_transport_bus.jpg",
+               "image": "assets/images/questions/bus.jpg",
                "osm_tags": {
                   "bus": "yes"
                }
             },
             {
                "name": "Straßenbahn",
-               "image": "assets/images/questions/mode_of_transport_tram.jpg",
+               "image": "assets/images/questions/tram.jpg",
                "osm_tags": {
                   "tram": "yes"
                }
             },
             {
                "name": "Zug",
-               "image": "assets/images/questions/mode_of_transport_train.jpg",
+               "image": "assets/images/questions/train.jpg",
                "osm_tags": {
                   "train": "yes"
                }
             },
             {
                "name": "Stadtbahn",
-               "image": "assets/images/questions/mode_of_transport_lightrail.jpg",
+               "image": "assets/images/questions/lightrail.jpg",
                "description": "Eine Stadtbahn ist eine Zwischenstufe zwischen Straßenbahn und traditionellem Zug. Sie verbindet oft ländliche Gebiete mit der Stadt und sind hochfluriger als Straßenbahnen.",
                "osm_tags": {
                   "light_rail": "yes"
@@ -2695,14 +2695,14 @@
             },
             {
                "name":"U-Bahn",
-               "image": "assets/images/questions/mode_of_transport_subway.jpg",
+               "image": "assets/images/questions/subway.jpg",
                "osm_tags": {
                   "subway": "yes"
                }
             },
             {
                "name": "Einschienenbahn",
-               "image": "assets/images/questions/mode_of_transport_monorail.jpg",
+               "image": "assets/images/questions/monorail.jpg",
                "description": "Eine Einschienenbahn fährt meistens über der Straßenebene und hat keine sichtbaren Räder.",
                "osm_tags": {
                   "monorail": "yes"
diff --git a/assets/images/questions/bus.jpg b/assets/images/questions/bus.jpg
new file mode 100644
index 00000000..ce153ae1
Binary files /dev/null and b/assets/images/questions/bus.jpg differ
diff --git a/assets/images/questions/mode_of_transport_lightrail.png b/assets/images/questions/lightrail.png
similarity index 100%
rename from assets/images/questions/mode_of_transport_lightrail.png
rename to assets/images/questions/lightrail.png
diff --git a/assets/images/questions/mode_of_transport_bus.png b/assets/images/questions/mode_of_transport_bus.png
deleted file mode 100644
index 9116bee3..00000000
Binary files a/assets/images/questions/mode_of_transport_bus.png and /dev/null differ
diff --git a/assets/images/questions/mode_of_transport_subway.png b/assets/images/questions/mode_of_transport_subway.png
deleted file mode 100644
index 388f4095..00000000
Binary files a/assets/images/questions/mode_of_transport_subway.png and /dev/null differ
diff --git a/assets/images/questions/mode_of_transport_tram.png b/assets/images/questions/mode_of_transport_tram.png
deleted file mode 100644
index 755d5bc3..00000000
Binary files a/assets/images/questions/mode_of_transport_tram.png and /dev/null differ
diff --git a/assets/images/questions/mode_of_transport_monorail.png b/assets/images/questions/monorail.png
similarity index 100%
rename from assets/images/questions/mode_of_transport_monorail.png
rename to assets/images/questions/monorail.png
diff --git a/assets/images/questions/subway.jpg b/assets/images/questions/subway.jpg
new file mode 100644
index 00000000..070ba81d
Binary files /dev/null and b/assets/images/questions/subway.jpg differ
diff --git a/assets/images/questions/mode_of_transport_train.png b/assets/images/questions/train.png
similarity index 100%
rename from assets/images/questions/mode_of_transport_train.png
rename to assets/images/questions/train.png
diff --git a/assets/images/questions/tram.jpg b/assets/images/questions/tram.jpg
new file mode 100644
index 00000000..8ff35c53
Binary files /dev/null and b/assets/images/questions/tram.jpg differ