Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 13612)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 13613)
@@ -87,5 +87,5 @@
      */
     protected final void loadIcons() {
-        mergeComplete = ImageProvider.get("dialogs", "valid");
+        mergeComplete = ImageProvider.get("misc", "green_check");
         mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete");
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java	(revision 13612)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java	(revision 13613)
@@ -174,5 +174,5 @@
             if ("valid".equals(getCurrentFeedback()))
                 return;
-            lblValid.setIcon(ImageProvider.get("dialogs", "valid"));
+            lblValid.setIcon(ImageProvider.get("misc", "green_check"));
             lblValid.setToolTipText(null);
             lblValid.putClientProperty("valid", "valid");
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 13612)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 13613)
@@ -193,5 +193,5 @@
                 Runnable r1 = () -> {
                     if (task.isSuccess()) {
-                        lblValid.setIcon(ImageProvider.get("dialogs", "valid"));
+                        lblValid.setIcon(ImageProvider.get("misc", "green_check"));
                         lblValid.setToolTipText(tr("The API URL is valid."));
                         lastTestedUrl = url;