diff --git a/needles/gnome/apps/maps/maps_button_save.json b/needles/gnome/apps/maps/maps_button_save.json
new file mode 100644
index 00000000..7e015d87
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_button_save.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 873,
+      "ypos": 228,
+      "width": 44,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_button_save"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_button_save.png b/needles/gnome/apps/maps/maps_button_save.png
new file mode 100644
index 00000000..996f418c
Binary files /dev/null and b/needles/gnome/apps/maps/maps_button_save.png differ
diff --git a/needles/gnome/apps/maps/maps_exported_map-20240710.json b/needles/gnome/apps/maps/maps_exported_map-20240710.json
new file mode 100644
index 00000000..a0c7c95a
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_exported_map-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 442,
+      "ypos": 385,
+      "height": 102,
+      "width": 141,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_exported_map"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_exported_map-20240710.png b/needles/gnome/apps/maps/maps_exported_map-20240710.png
new file mode 100644
index 00000000..f6fb5492
Binary files /dev/null and b/needles/gnome/apps/maps/maps_exported_map-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_found_brno-20240710.json b/needles/gnome/apps/maps/maps_found_brno-20240710.json
new file mode 100644
index 00000000..dcc54e17
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_brno-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 137,
+      "ypos": 365,
+      "xpos": 443,
+      "height": 117
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_brno"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_brno-20240710.png b/needles/gnome/apps/maps/maps_found_brno-20240710.png
new file mode 100644
index 00000000..c1dd548e
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_brno-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_found_denali-20240710.json b/needles/gnome/apps/maps/maps_found_denali-20240710.json
new file mode 100644
index 00000000..d1928c17
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_denali-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 146,
+      "type": "match",
+      "height": 107,
+      "xpos": 382,
+      "ypos": 354
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_denali"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_denali-20240710.png b/needles/gnome/apps/maps/maps_found_denali-20240710.png
new file mode 100644
index 00000000..81d6876d
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_denali-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_found_poysdorf-20240710.json b/needles/gnome/apps/maps/maps_found_poysdorf-20240710.json
new file mode 100644
index 00000000..fdb7533c
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_poysdorf-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 129,
+      "xpos": 421,
+      "ypos": 361,
+      "width": 150,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_poysdorf"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_poysdorf-20240710.png b/needles/gnome/apps/maps/maps_found_poysdorf-20240710.png
new file mode 100644
index 00000000..6d83fad6
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_poysdorf-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_found_pune-20240710.json b/needles/gnome/apps/maps/maps_found_pune-20240710.json
new file mode 100644
index 00000000..832ce460
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_pune-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 212,
+      "ypos": 359,
+      "xpos": 392,
+      "height": 128
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_pune"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_pune-20240710.png b/needles/gnome/apps/maps/maps_found_pune-20240710.png
new file mode 100644
index 00000000..fe19f9fd
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_pune-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_found_vilnius-20240710.json b/needles/gnome/apps/maps/maps_found_vilnius-20240710.json
new file mode 100644
index 00000000..4d55d1d7
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_vilnius-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 192,
+      "type": "match",
+      "height": 140,
+      "xpos": 406,
+      "ypos": 356
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_vilnius"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_vilnius-20240710.png b/needles/gnome/apps/maps/maps_found_vilnius-20240710.png
new file mode 100644
index 00000000..a4347cd4
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_vilnius-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_found_wellington-20240710.json b/needles/gnome/apps/maps/maps_found_wellington-20240710.json
new file mode 100644
index 00000000..b2b4fdbd
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_found_wellington-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 119,
+      "xpos": 401,
+      "ypos": 349,
+      "width": 198,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_wellington"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_found_wellington-20240710.png b/needles/gnome/apps/maps/maps_found_wellington-20240710.png
new file mode 100644
index 00000000..61683d61
Binary files /dev/null and b/needles/gnome/apps/maps/maps_found_wellington-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_info_poysdorf-cutoff-20240710.json b/needles/gnome/apps/maps/maps_info_poysdorf-cutoff-20240710.json
new file mode 100644
index 00000000..c980102e
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_info_poysdorf-cutoff-20240710.json
@@ -0,0 +1,34 @@
+{
+  "area": [
+    {
+      "ypos": 42,
+      "xpos": 241,
+      "height": 55,
+      "type": "match",
+      "width": 96
+    },
+    {
+      "ypos": 568,
+      "xpos": 451,
+      "height": 71,
+      "type": "match",
+      "width": 91
+    },
+    {
+      "type": "match",
+      "width": 90,
+      "ypos": 744,
+      "xpos": 378,
+      "height": 22
+    }
+  ],
+  "properties": [
+    {
+      "name": "workaround",
+      "value": "https://gitlab.gnome.org/GNOME/gnome-maps/-/issues/693"
+    }
+  ],
+  "tags": [
+    "maps_info_poysdorf"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_info_poysdorf-cutoff-20240710.png b/needles/gnome/apps/maps/maps_info_poysdorf-cutoff-20240710.png
new file mode 100644
index 00000000..55b20cca
Binary files /dev/null and b/needles/gnome/apps/maps/maps_info_poysdorf-cutoff-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_info_vilnius-20240710.json b/needles/gnome/apps/maps/maps_info_vilnius-20240710.json
new file mode 100644
index 00000000..bf52f2d9
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_info_vilnius-20240710.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "width": 98,
+      "type": "match",
+      "xpos": 381,
+      "ypos": 187,
+      "height": 60
+    },
+    {
+      "type": "match",
+      "width": 52,
+      "ypos": 101,
+      "xpos": 457,
+      "height": 36
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_info_vilnius"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_info_vilnius-20240710.png b/needles/gnome/apps/maps/maps_info_vilnius-20240710.png
new file mode 100644
index 00000000..b74d55d7
Binary files /dev/null and b/needles/gnome/apps/maps/maps_info_vilnius-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_map_zoomed-20240710.json b/needles/gnome/apps/maps/maps_map_zoomed-20240710.json
new file mode 100644
index 00000000..550d8250
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_map_zoomed-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 197,
+      "type": "match",
+      "height": 162,
+      "xpos": 407,
+      "ypos": 419
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_map_zoomed"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_map_zoomed-20240710.png b/needles/gnome/apps/maps/maps_map_zoomed-20240710.png
new file mode 100644
index 00000000..40ba0805
Binary files /dev/null and b/needles/gnome/apps/maps/maps_map_zoomed-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_route_bike_shown-20240710.json b/needles/gnome/apps/maps/maps_route_bike_shown-20240710.json
new file mode 100644
index 00000000..8ebedfaa
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_route_bike_shown-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 354,
+      "xpos": 347,
+      "height": 318,
+      "type": "match",
+      "width": 102
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_bike_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_route_bike_shown-20240710.png b/needles/gnome/apps/maps/maps_route_bike_shown-20240710.png
new file mode 100644
index 00000000..10a1de78
Binary files /dev/null and b/needles/gnome/apps/maps/maps_route_bike_shown-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_route_car_shown-20240710.json b/needles/gnome/apps/maps/maps_route_car_shown-20240710.json
new file mode 100644
index 00000000..d43f41c0
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_route_car_shown-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 80,
+      "type": "match",
+      "height": 309,
+      "xpos": 355,
+      "ypos": 371
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_car_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_route_car_shown-20240710.png b/needles/gnome/apps/maps/maps_route_car_shown-20240710.png
new file mode 100644
index 00000000..cca75020
Binary files /dev/null and b/needles/gnome/apps/maps/maps_route_car_shown-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_route_type_car-20240710.json b/needles/gnome/apps/maps/maps_route_type_car-20240710.json
new file mode 100644
index 00000000..b5d0847f
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_route_type_car-20240710.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 24,
+      "xpos": 853,
+      "ypos": 97,
+      "width": 23,
+      "type": "match",
+      "match": 94
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_type_car"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_route_type_car-20240710.png b/needles/gnome/apps/maps/maps_route_type_car-20240710.png
new file mode 100644
index 00000000..f6002234
Binary files /dev/null and b/needles/gnome/apps/maps/maps_route_type_car-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_route_walk_shown-20240710.json b/needles/gnome/apps/maps/maps_route_walk_shown-20240710.json
new file mode 100644
index 00000000..518d321c
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_route_walk_shown-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 147,
+      "xpos": 319,
+      "ypos": 417,
+      "width": 73,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_route_walk_shown"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_route_walk_shown-20240710.png b/needles/gnome/apps/maps/maps_route_walk_shown-20240710.png
new file mode 100644
index 00000000..d0835137
Binary files /dev/null and b/needles/gnome/apps/maps/maps_route_walk_shown-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_scale_off-20240710.json b/needles/gnome/apps/maps/maps_scale_off-20240710.json
new file mode 100644
index 00000000..8e160ffc
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_scale_off-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 157,
+      "height": 61,
+      "ypos": 699,
+      "xpos": 5
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_scale_off"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_scale_off-20240710.png b/needles/gnome/apps/maps/maps_scale_off-20240710.png
new file mode 100644
index 00000000..b63e3f3e
Binary files /dev/null and b/needles/gnome/apps/maps/maps_scale_off-20240710.png differ
diff --git a/needles/gnome/apps/maps/maps_scale_on-20240710.json b/needles/gnome/apps/maps/maps_scale_on-20240710.json
new file mode 100644
index 00000000..b797c3ef
--- /dev/null
+++ b/needles/gnome/apps/maps/maps_scale_on-20240710.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 151,
+      "type": "match",
+      "height": 38,
+      "xpos": 1,
+      "ypos": 724
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_scale_on"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/maps/maps_scale_on-20240710.png b/needles/gnome/apps/maps/maps_scale_on-20240710.png
new file mode 100644
index 00000000..d10ea6f9
Binary files /dev/null and b/needles/gnome/apps/maps/maps_scale_on-20240710.png differ
diff --git a/tests/applications/maps/export.pm b/tests/applications/maps/export.pm
index 9f5f4e18..0f1b8355 100644
--- a/tests/applications/maps/export.pm
+++ b/tests/applications/maps/export.pm
@@ -13,7 +13,7 @@ sub run {
     assert_and_click("gnome_burger_menu");
     assert_and_click("maps_menu_export");
     # wait for the export screen to appear and settle
-    assert_screen("maps_button_export");
+    assert_and_click("maps_button_export");
     wait_still_screen(2);
 
     # Rename the file and export it.
@@ -21,7 +21,7 @@ sub run {
     # just going to rename the proposed file name.
     send_key("ctrl-a");
     type_very_safely("exported-map.png");
-    assert_and_click("maps_button_export");
+    assert_and_click("maps_button_save");
 
     # After the map has been exported, we will open
     # it in an image viewer to see that it is correct.