diff --git a/needles/firefox/firefox_close_tabs-20181031.json b/needles/firefox/firefox_close_tabs-20181031.json
deleted file mode 100644
index 52cd4143..00000000
--- a/needles/firefox/firefox_close_tabs-20181031.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "area": [
-        {
-            "height": 13,
-            "type": "match",
-            "width": 68,
-            "xpos": 668,
-            "ypos": 419
-        }
-    ],
-    "properties": [],
-    "tags": [
-        "firefox_close_tabs"
-    ]
-}
\ No newline at end of file
diff --git a/needles/firefox/firefox_close_tabs-20181031.png b/needles/firefox/firefox_close_tabs-20181031.png
deleted file mode 100644
index 39da362a..00000000
Binary files a/needles/firefox/firefox_close_tabs-20181031.png and /dev/null differ
diff --git a/needles/firefox/firefox_close_tabs-adwaita-20190211.json b/needles/firefox/firefox_close_tabs-adwaita-20190211.json
deleted file mode 100644
index a2796709..00000000
--- a/needles/firefox/firefox_close_tabs-adwaita-20190211.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 13,
-      "xpos": 668,
-      "width": 68,
-      "type": "match",
-      "ypos": 419
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "firefox_close_tabs"
-  ]
-}
\ No newline at end of file
diff --git a/needles/firefox/firefox_close_tabs-adwaita-20190211.png b/needles/firefox/firefox_close_tabs-adwaita-20190211.png
deleted file mode 100644
index 81069671..00000000
Binary files a/needles/firefox/firefox_close_tabs-adwaita-20190211.png and /dev/null differ
diff --git a/needles/gnome/apps/apps_run_firefox_stop-20190220.json b/needles/gnome/apps/apps_run_firefox_stop-20190220.json
deleted file mode 100644
index bccca222..00000000
--- a/needles/gnome/apps/apps_run_firefox_stop-20190220.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 451,
-      "width": 75,
-      "height": 18,
-      "xpos": 662
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "apps_run_firefox_stop"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/apps_run_firefox_stop-20190220.png b/needles/gnome/apps/apps_run_firefox_stop-20190220.png
deleted file mode 100644
index 20f82cef..00000000
Binary files a/needles/gnome/apps/apps_run_firefox_stop-20190220.png and /dev/null differ
diff --git a/needles/gnome/apps/apps_run_firefox_stop-20190328.json b/needles/gnome/apps/apps_run_firefox_stop-20190328.json
deleted file mode 100644
index 93407531..00000000
--- a/needles/gnome/apps/apps_run_firefox_stop-20190328.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 658,
-      "height": 15,
-      "width": 75,
-      "type": "match",
-      "ypos": 451
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "apps_run_firefox_stop"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/apps_run_firefox_stop-20190328.png b/needles/gnome/apps/apps_run_firefox_stop-20190328.png
deleted file mode 100644
index 43d934f6..00000000
Binary files a/needles/gnome/apps/apps_run_firefox_stop-20190328.png and /dev/null differ
diff --git a/needles/gnome/apps/apps_run_firefox_stop.json b/needles/gnome/apps/apps_run_firefox_stop.json
deleted file mode 100644
index cc992bad..00000000
--- a/needles/gnome/apps/apps_run_firefox_stop.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "apps_run_firefox_stop"
-  ],
-  "area": [
-    {
-      "xpos": 662,
-      "ypos": 451,
-      "width": 75,
-      "height": 18,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/apps_run_firefox_stop.png b/needles/gnome/apps/apps_run_firefox_stop.png
deleted file mode 100644
index fbae21e2..00000000
Binary files a/needles/gnome/apps/apps_run_firefox_stop.png and /dev/null differ
diff --git a/needles/kde/apps/firefox_close_tabs-20190509.json b/needles/kde/apps/firefox_close_tabs-20190509.json
deleted file mode 100644
index d9dd7ba6..00000000
--- a/needles/kde/apps/firefox_close_tabs-20190509.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 416,
-      "xpos": 672,
-      "type": "match",
-      "height": 14,
-      "width": 70
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "firefox_close_tabs"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/firefox_close_tabs-20190509.png b/needles/kde/apps/firefox_close_tabs-20190509.png
deleted file mode 100644
index ec11e0b1..00000000
Binary files a/needles/kde/apps/firefox_close_tabs-20190509.png and /dev/null differ
diff --git a/needles/kde/apps/firefox_close_tabs.json b/needles/kde/apps/firefox_close_tabs.json
deleted file mode 100644
index 58cf65c1..00000000
--- a/needles/kde/apps/firefox_close_tabs.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "firefox_close_tabs"
-  ],
-  "area": [
-    {
-      "xpos": 672,
-      "ypos": 416,
-      "width": 70,
-      "height": 14,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/firefox_close_tabs.png b/needles/kde/apps/firefox_close_tabs.png
deleted file mode 100644
index 2ced2577..00000000
Binary files a/needles/kde/apps/firefox_close_tabs.png and /dev/null differ
diff --git a/tests/apps_startstop/gnome/firefox.pm b/tests/apps_startstop/gnome/firefox.pm
index e8fedd43..5557aa5e 100644
--- a/tests/apps_startstop/gnome/firefox.pm
+++ b/tests/apps_startstop/gnome/firefox.pm
@@ -19,8 +19,8 @@ sub run {
     assert_and_click 'apps_stop';
     wait_still_screen 2;
     # deal with warning screen
-    if (check_screen("apps_run_firefox_stop", 1)) {
-        assert_and_click 'apps_run_firefox_stop';
+    if (check_screen("firefox_close_tabs", 1)) {
+        click_lastmatch;
     }
     wait_still_screen 2;
     # Register application