diff --git a/needles/gnome/apps/nautilus/nautilus_big_icons-20240220.json b/needles/gnome/apps/nautilus/nautilus_big_icons-20240220.json
deleted file mode 100644
index e5a4deee..00000000
--- a/needles/gnome/apps/nautilus/nautilus_big_icons-20240220.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 307,
-      "ypos": 323,
-      "width": 53,
-      "height": 55,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "nautilus_big_icons"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/apps/nautilus/nautilus_big_icons-20240220.png b/needles/gnome/apps/nautilus/nautilus_big_icons-20240220.png
deleted file mode 100644
index 181e577a..00000000
Binary files a/needles/gnome/apps/nautilus/nautilus_big_icons-20240220.png and /dev/null differ
diff --git a/needles/kde/apps/abrt_runs-problemdetected-bigwindow-20240227.json b/needles/kde/apps/abrt_runs-problemdetected-bigwindow-20240227.json
new file mode 100644
index 00000000..7e7ac10c
--- /dev/null
+++ b/needles/kde/apps/abrt_runs-problemdetected-bigwindow-20240227.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "ypos": 232,
+      "type": "match",
+      "width": 145,
+      "height": 15,
+      "xpos": 314
+    }
+  ],
+  "properties": [
+    {
+      "name": "workaround",
+      "value": "workaround for bug 2060540 (window is too large for screen). this is fragile, will fail if there is a crash"
+    }
+  ],
+  "tags": [
+    "abrt_runs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/abrt_runs-problemdetected-bigwindow-20240227.png b/needles/kde/apps/abrt_runs-problemdetected-bigwindow-20240227.png
new file mode 100644
index 00000000..bfdf0baf
Binary files /dev/null and b/needles/kde/apps/abrt_runs-problemdetected-bigwindow-20240227.png differ
diff --git a/needles/kde/apps/kmail_account_dialogue.json b/needles/kde/apps/kmail_account_dialogue.json
new file mode 100644
index 00000000..c4f18f09
--- /dev/null
+++ b/needles/kde/apps/kmail_account_dialogue.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 510,
+      "ypos": 214,
+      "width": 126,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kmail_account_dialogue"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/kmail_account_dialogue.png b/needles/kde/apps/kmail_account_dialogue.png
new file mode 100644
index 00000000..8273f05f
Binary files /dev/null and b/needles/kde/apps/kmail_account_dialogue.png differ
diff --git a/needles/kde/apps/systemmonitor_runs-20240227.json b/needles/kde/apps/systemmonitor_runs-20240227.json
new file mode 100644
index 00000000..978083d5
--- /dev/null
+++ b/needles/kde/apps/systemmonitor_runs-20240227.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 423,
+      "ypos": 5,
+      "height": 20,
+      "width": 182
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "systemmonitor_runs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/systemmonitor_runs-20240227.png b/needles/kde/apps/systemmonitor_runs-20240227.png
new file mode 100644
index 00000000..5f57d3bf
Binary files /dev/null and b/needles/kde/apps/systemmonitor_runs-20240227.png differ
diff --git a/needles/kde/kde_exit_icon.json b/needles/kde/kde_exit_icon.json
new file mode 100644
index 00000000..4ad09910
--- /dev/null
+++ b/needles/kde/kde_exit_icon.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 888,
+      "ypos": 27,
+      "width": 23,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "kde_exit_icon"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/kde_exit_icon.png b/needles/kde/kde_exit_icon.png
new file mode 100644
index 00000000..879dd0e1
Binary files /dev/null and b/needles/kde/kde_exit_icon.png differ
diff --git a/tests/apps_startstop/kde/kmail.pm b/tests/apps_startstop/kde/kmail.pm
index ccb899d4..26281f36 100644
--- a/tests/apps_startstop/kde/kmail.pm
+++ b/tests/apps_startstop/kde/kmail.pm
@@ -10,19 +10,15 @@ sub run {
 
     # Start the application
     menu_launch_type 'kmail';
-    # Cancel Kmail data wizard
-    assert_and_click 'kde_cancel_button', timeout => 60;
-    # Sometimes, the Kmail window is shown over the settings window.
-    # If that is the case, assert that Kmail is running and exit.
-    unless (check_screen("kmail_runs")) {
-        if (check_screen("kde_cancel_button", 1)) {
-            click_lastmatch;
-        }
-        assert_screen("kmail_runs");
-    }
-    else {
-        assert_screen("kmail_runs");
+    # The Kmail window is now covered with an account
+    # creation dialogue. Let's get rid of it to be able
+    # to assert the Kmail window again.
+    if (check_screen("kmail_account_dialogue", timeout => 30)) {
+        # Click on the exit icon
+        assert_and_click("kde_exit_icon");
     }
+    assert_screen("kmail_runs");
+
     # Close the application
     quit_with_shortcut();
 }
diff --git a/tests/apps_startstop/kde/kontakt.pm b/tests/apps_startstop/kde/kontakt.pm
index 2054b649..217ac460 100644
--- a/tests/apps_startstop/kde/kontakt.pm
+++ b/tests/apps_startstop/kde/kontakt.pm
@@ -10,9 +10,13 @@ sub run {
 
     # Start the application
     menu_launch_type 'kontact';
-    # Get rid of personal data
-    assert_and_click 'kde_cancel_button', timeout => 60;
-    # Check that it is started
+    # Similar to Kmail, we have the same dialogue
+    # covering the application. Let's get rid of it, too.
+    if (check_screen("kmail_account_dialogue", timeout => 30)) {
+        # Click on the exit icon
+        assert_and_click("kde_exit_icon");
+    }
+    # Check that the application window is there.
     assert_screen 'kontact_runs';
     # Close the application
     quit_with_shortcut();