diff --git a/needles/gnome/apps/evince/evince_about_credits.json b/needles/gnome/apps/evince/evince_about_credits.json
deleted file mode 100644
index 8c8ad2bc..00000000
--- a/needles/gnome/apps/evince/evince_about_credits.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 546,
-      "ypos": 224,
-      "width": 53,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "evince_about_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/evince/evince_about_credits.png b/needles/gnome/apps/evince/evince_about_credits.png
deleted file mode 100644
index ecb3fd92..00000000
Binary files a/needles/gnome/apps/evince/evince_about_credits.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220204.json b/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220204.json
deleted file mode 100644
index e96ba994..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 484,
-      "ypos": 243,
-      "width": 54,
-      "height": 18,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_about_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220204.png b/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220204.png
deleted file mode 100644
index 304a0708..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220204.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220304.json b/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220304.json
deleted file mode 100644
index 33a76518..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220304.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 18,
-      "ypos": 243,
-      "type": "match",
-      "xpos": 484,
-      "width": 54
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_about_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220304.png b/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220304.png
deleted file mode 100644
index c2dd41c6..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220304.png and /dev/null differ
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220723.json b/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220723.json
deleted file mode 100644
index 39b68dee..00000000
--- a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220723.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 631,
-      "height": 18,
-      "type": "match",
-      "width": 54,
-      "xpos": 355
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gte_about_credits"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220723.png b/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220723.png
deleted file mode 100644
index 7fb08758..00000000
Binary files a/needles/gnome/apps/gnome-text-editor/gte_about_credits-20220723.png and /dev/null differ
diff --git a/needles/gnome/gnome_button_credits.json b/needles/gnome/gnome_button_credits-bold.json
similarity index 100%
rename from needles/gnome/gnome_button_credits.json
rename to needles/gnome/gnome_button_credits-bold.json
diff --git a/needles/gnome/gnome_button_credits.png b/needles/gnome/gnome_button_credits-bold.png
similarity index 100%
rename from needles/gnome/gnome_button_credits.png
rename to needles/gnome/gnome_button_credits-bold.png
diff --git a/needles/gnome/apps/eog/eog_about_credits.json b/needles/gnome/gnome_button_credits-eog-dark.json
similarity index 79%
rename from needles/gnome/apps/eog/eog_about_credits.json
rename to needles/gnome/gnome_button_credits-eog-dark.json
index e62709d6..b28e9961 100644
--- a/needles/gnome/apps/eog/eog_about_credits.json
+++ b/needles/gnome/gnome_button_credits-eog-dark.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "eog_about_credits"
+    "gnome_button_credits"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/eog/eog_about_credits.png b/needles/gnome/gnome_button_credits-eog-dark.png
similarity index 100%
rename from needles/gnome/apps/eog/eog_about_credits.png
rename to needles/gnome/gnome_button_credits-eog-dark.png
diff --git a/needles/gnome/apps/nautilus/nautilus_about_credits-20220722.json b/needles/gnome/gnome_button_credits-libadwaita-20220722.json
similarity index 79%
rename from needles/gnome/apps/nautilus/nautilus_about_credits-20220722.json
rename to needles/gnome/gnome_button_credits-libadwaita-20220722.json
index d2310716..e1412ee5 100644
--- a/needles/gnome/apps/nautilus/nautilus_about_credits-20220722.json
+++ b/needles/gnome/gnome_button_credits-libadwaita-20220722.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_about_credits"
+    "gnome_button_credits"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/nautilus/nautilus_about_credits-20220722.png b/needles/gnome/gnome_button_credits-libadwaita-20220722.png
similarity index 100%
rename from needles/gnome/apps/nautilus/nautilus_about_credits-20220722.png
rename to needles/gnome/gnome_button_credits-libadwaita-20220722.png
diff --git a/needles/gnome/apps/nautilus/nautilus_about_credits.json b/needles/gnome/gnome_button_credits-regular.json
similarity index 79%
rename from needles/gnome/apps/nautilus/nautilus_about_credits.json
rename to needles/gnome/gnome_button_credits-regular.json
index 389aa51f..aff36cbc 100644
--- a/needles/gnome/apps/nautilus/nautilus_about_credits.json
+++ b/needles/gnome/gnome_button_credits-regular.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "nautilus_about_credits"
+    "gnome_button_credits"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/nautilus/nautilus_about_credits.png b/needles/gnome/gnome_button_credits-regular.png
similarity index 100%
rename from needles/gnome/apps/nautilus/nautilus_about_credits.png
rename to needles/gnome/gnome_button_credits-regular.png
diff --git a/tests/applications/eog/about.pm b/tests/applications/eog/about.pm
index ca8c145f..447b9070 100644
--- a/tests/applications/eog/about.pm
+++ b/tests/applications/eog/about.pm
@@ -16,7 +16,7 @@ sub run {
     wait_still_screen(3);
     assert_screen("eog_about_shown");
     # Click on Credits
-    assert_and_click("eog_about_credits");
+    assert_and_click("gnome_button_credits");
     wait_still_screen(2);
     assert_screen("eog_credits_shown");
 }
diff --git a/tests/applications/evince/about.pm b/tests/applications/evince/about.pm
index ae9af614..85e2689e 100644
--- a/tests/applications/evince/about.pm
+++ b/tests/applications/evince/about.pm
@@ -19,7 +19,7 @@ sub run {
     assert_screen("evince_about_shown");
 
     # Click on Credits button to see the second part of the dialogue.
-    assert_and_click("evince_about_credits", button => "left", timeout => 30);
+    assert_and_click("gnome_button_credits", button => "left", timeout => 30);
 
     # Check that Credits are accessible and visible, too.
     assert_screen("evince_credits_shown");
diff --git a/tests/applications/gnome-text-editor/about.pm b/tests/applications/gnome-text-editor/about.pm
index 93f09bef..d7c0887e 100644
--- a/tests/applications/gnome-text-editor/about.pm
+++ b/tests/applications/gnome-text-editor/about.pm
@@ -19,7 +19,7 @@ sub run {
     assert_screen "gte_about_shown";
 
     # Click on Credits to move to another screen.
-    assert_and_click "gte_about_credits";
+    assert_and_click "gnome_button_credits";
     wait_still_screen(2);
 
     # Check that Credits were shown.
diff --git a/tests/applications/nautilus/about.pm b/tests/applications/nautilus/about.pm
index 5ccb031e..f2ab6f1c 100644
--- a/tests/applications/nautilus/about.pm
+++ b/tests/applications/nautilus/about.pm
@@ -19,7 +19,7 @@ sub run {
     assert_screen("nautilus_about_show");
 
     # Click on Credits button to see the second part of the dialogue.
-    assert_and_click("nautilus_about_credits", button => "left", timeout => 30);
+    assert_and_click("gnome_button_credits", button => "left", timeout => 30);
 
     # Check that Credits are accessible and visible, too.
     assert_screen("nautilus_credits_shown");