diff --git a/needles/gnome/apps/maps/maps_button_save.json b/needles/gnome/apps/maps/maps_button_save.json
deleted file mode 100644
index 7e015d87..00000000
--- a/needles/gnome/apps/maps/maps_button_save.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "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
deleted file mode 100644
index 996f418c..00000000
Binary files a/needles/gnome/apps/maps/maps_button_save.png and /dev/null differ
diff --git a/needles/gnome/gnome_button_save-boldblue-20220818.json b/needles/gnome/gnome_button_save-boldblue-20220818.json
index c706ea45..44302481 100644
--- a/needles/gnome/gnome_button_save-boldblue-20220818.json
+++ b/needles/gnome/gnome_button_save-boldblue-20220818.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "gnome_button_save_blue"
+    "gnome_button_save"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/gnome_button_save-boldblue-20240424.json b/needles/gnome/gnome_button_save-boldblue-20240424.json
index 8f81c957..3d8f66fb 100644
--- a/needles/gnome/gnome_button_save-boldblue-20240424.json
+++ b/needles/gnome/gnome_button_save-boldblue-20240424.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "gnome_button_save_blue"
+    "gnome_button_save"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/gnome_button_save_blue.json b/needles/gnome/gnome_button_save_blue.json
index e6e1394d..15e4de38 100644
--- a/needles/gnome/gnome_button_save_blue.json
+++ b/needles/gnome/gnome_button_save_blue.json
@@ -1,7 +1,7 @@
 {
   "properties": [],
   "tags": [
-    "gnome_button_save_blue"
+    "gnome_button_save"
   ],
   "area": [
     {
@@ -12,4 +12,4 @@
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/applications/evince/save_as.pm b/tests/applications/evince/save_as.pm
index 13bfbcd7..89fa9dab 100644
--- a/tests/applications/evince/save_as.pm
+++ b/tests/applications/evince/save_as.pm
@@ -23,7 +23,7 @@ sub run {
     type_very_safely("alternative");
 
     # Click on the Save button
-    assert_and_click("gnome_button_save_blue", button => "left", timeout => 30);
+    assert_and_click("gnome_button_save", button => "left", timeout => 30);
 
     # Now the document is saved under a different name. We will switch to the
     # terminal console to check that it has been created.
diff --git a/tests/applications/gnome-text-editor/new_file.pm b/tests/applications/gnome-text-editor/new_file.pm
index 8cbd94ad..0abec6a6 100644
--- a/tests/applications/gnome-text-editor/new_file.pm
+++ b/tests/applications/gnome-text-editor/new_file.pm
@@ -41,7 +41,7 @@ sub run {
     send_key("ctrl-a");
     wait_still_screen(3);
     type_very_safely "list.md";
-    send_key("ret");
+    assert_and_click("gnome_button_save");
     assert_screen("gte_file_saved");
     # Check that the file has been created
     $self->root_console(tty => 3);
diff --git a/tests/applications/maps/export.pm b/tests/applications/maps/export.pm
index 22ffca7e..0a5578be 100644
--- a/tests/applications/maps/export.pm
+++ b/tests/applications/maps/export.pm
@@ -38,7 +38,7 @@ sub run {
         # Rename the file and export it
         assert_and_click("nautilus_save_filename");
         type_very_safely("exported-map");
-        assert_and_click("maps_button_save");
+        assert_and_click("gnome_button_save");
     }
 
     # After the map has been exported, we will open