diff --git a/native/WinLauncher/WinLauncher/WinLauncher.rc b/native/WinLauncher/WinLauncher/WinLauncher.rc
index 189f5df50f5f..10463067acc8 100644
--- a/native/WinLauncher/WinLauncher/WinLauncher.rc
+++ b/native/WinLauncher/WinLauncher/WinLauncher.rc
@@ -153,7 +153,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_VM_OPTIONS          "-Didea.jre.check=false"
+    IDS_VM_OPTIONS          "-Didea.jre.check=false -Dide.native.launcher=true"
     IDS_PROPS_ENV_VAR       "IDEA_PROPERTIES"
     IDS_VM_OPTIONS_ENV_VAR  "IDEA_VM_OPTIONS"
     IDS_ERROR_LAUNCHING_APP "Error Launching IntelliJ Platform"
diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
index 1ebefce37c2d..76a67ab5c3ba 100644
--- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
@@ -70,10 +70,10 @@ public class AppUIUtil {
 
   public static void updateWindowIcon(@NotNull Window window) {
     if (SystemInfo.isWindows &&
-        Integer.getInteger("jbre.win.app.icon.id") != null &&
-        SystemProperties.getBooleanProperty("jbre.win.app.icon.supported", false)) // set by JBRE
+        SystemProperties.getBooleanProperty("ide.native.launcher", false) &&
+        SystemProperties.getBooleanProperty("jbre.win.app.icon.supported", false)) // todo[tav] defined by JBRE, remove when OpenJDK supports it as well
     {
-      return; // JBRE will load icon from the exe resource
+      return; // JDK will load icon from the exe resource
     }
     ApplicationInfoEx appInfo = ApplicationInfoImpl.getShadowInstance();
     List<Image> images = ContainerUtil.newArrayListWithCapacity(3);