diff --git a/needles/kde/apps/kde_next-20210609.json b/needles/kde/apps/kde_next-blue-20210609.json
similarity index 100%
rename from needles/kde/apps/kde_next-20210609.json
rename to needles/kde/apps/kde_next-blue-20210609.json
diff --git a/needles/kde/apps/kde_next-20210609.png b/needles/kde/apps/kde_next-blue-20210609.png
similarity index 100%
rename from needles/kde/apps/kde_next-20210609.png
rename to needles/kde/apps/kde_next-blue-20210609.png
diff --git a/needles/kde/apps/kgpg_next-noto-20210408.json b/needles/kde/apps/kde_next-lightblue-20210929.json
similarity index 65%
rename from needles/kde/apps/kgpg_next-noto-20210408.json
rename to needles/kde/apps/kde_next-lightblue-20210929.json
index 0ef9d031..bd410054 100644
--- a/needles/kde/apps/kgpg_next-noto-20210408.json
+++ b/needles/kde/apps/kde_next-lightblue-20210929.json
@@ -2,14 +2,14 @@
   "area": [
     {
       "width": 55,
-      "xpos": 203,
-      "height": 18,
       "type": "match",
-      "ypos": 242
+      "ypos": 242,
+      "height": 18,
+      "xpos": 203
     }
   ],
   "properties": [],
   "tags": [
-    "kgpg_next"
+    "kde_next"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/kde/apps/kde_next-lightblue-20210929.png b/needles/kde/apps/kde_next-lightblue-20210929.png
new file mode 100644
index 00000000..f118b234
Binary files /dev/null and b/needles/kde/apps/kde_next-lightblue-20210929.png differ
diff --git a/needles/kde/apps/kgpg_next-noto-20210408.png b/needles/kde/apps/kgpg_next-noto-20210408.png
deleted file mode 100644
index fa108ad1..00000000
Binary files a/needles/kde/apps/kgpg_next-noto-20210408.png and /dev/null differ
diff --git a/needles/kde/apps/kgpg_next_blue-noto-20210408.json b/needles/kde/apps/kgpg_next_blue-noto-20210408.json
deleted file mode 100644
index b058e8b9..00000000
--- a/needles/kde/apps/kgpg_next_blue-noto-20210408.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 18,
-      "xpos": 203,
-      "width": 55,
-      "type": "match",
-      "ypos": 242
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kgpg_next_blue"
-  ]
-}
\ No newline at end of file
diff --git a/needles/kde/apps/kgpg_next_blue-noto-20210408.png b/needles/kde/apps/kgpg_next_blue-noto-20210408.png
deleted file mode 100644
index d214062d..00000000
Binary files a/needles/kde/apps/kgpg_next_blue-noto-20210408.png and /dev/null differ
diff --git a/tests/apps_startstop/kde/kgpg.pm b/tests/apps_startstop/kde/kgpg.pm
index c08e100d..e5c5fb09 100644
--- a/tests/apps_startstop/kde/kgpg.pm
+++ b/tests/apps_startstop/kde/kgpg.pm
@@ -11,16 +11,16 @@ sub run {
     # Start the application
     menu_launch_type 'kgpg';
     # Deal with the first wizard screen
-    assert_and_click 'kgpg_next';
+    assert_and_click 'kde_next';
     wait_still_screen 2;
     # Deal with the second wizard screen
-    assert_and_click 'kgpg_next_blue';
+    assert_and_click 'kde_next';
     wait_still_screen 2;
     # Create configuration file
     assert_and_click 'kgpg_create_config';
     wait_still_screen 2;
     # Click Next
-    assert_and_click 'kgpg_next_blue';
+    assert_and_click 'kde_next';
     wait_still_screen 2;
     # Click Finish
     assert_and_click 'kgpg_done';