Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 18985)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 18986)
@@ -418,5 +418,5 @@
         if (canContinue) {
             ed = new ExtendedDialog(mainFrame, title, tr("Stop"), tr("Continue"));
-            ed.setButtonIcons("cancel", "ok");
+            ed.setButtonIcons("cancel", "apply");
         } else {
             ed = new ExtendedDialog(mainFrame, title, tr("Stop"));
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 18985)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 18986)
@@ -414,5 +414,5 @@
         final StringBuilder missingArguments = new StringBuilder();
         for (String arg : expectedJvmArguments) {
-            if (!vmArguments.contains(arg)) {
+            if (vmArguments.stream().noneMatch(s -> s.contains(arg))) {
                 if (missingArguments.length() > 0) {
                     missingArguments.append("<br>");