--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java	Wed Aug 28 07:32:23 2019 -0400
@@ -215,7 +215,7 @@
                 (s, p) -> s
         );
 
-    private final static String DEFAULT_ICON = "javalogo_white_32.png";
+    private final static String DEFAULT_ICON = "java32.png";
     private final static String DEFAULT_CONTROL_TEMPLATE = "template.control";
     private final static String DEFAULT_PRERM_TEMPLATE = "template.prerm";
     private final static String DEFAULT_PREINSTALL_TEMPLATE =

--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java	Wed Aug 28 07:32:23 2019 -0400
@@ -154,7 +154,7 @@
             },
             (s, p) -> s);
 
-    private final static String DEFAULT_ICON = "javalogo_white_32.png";
+    private final static String DEFAULT_ICON = "java32.png";
     private final static String DEFAULT_SPEC_TEMPLATE = "template.spec";
     private final static String DEFAULT_DESKTOP_FILE_TEMPLATE =
             "template.desktop";

Binary file src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png has changed

Binary file src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/javalogo_white_32.png has changed

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java	Wed Aug 28 07:32:23 2019 -0400
@@ -44,7 +44,7 @@
     private static final ResourceBundle I18N = ResourceBundle.getBundle(
             "jdk.jpackage.internal.resources.MacResources");
 
-    private static final String TEMPLATE_BUNDLE_ICON = "GenericApp.icns";
+    private static final String TEMPLATE_BUNDLE_ICON = "java.icns";
 
     public static Map<String, String> getMacCategories() {
         Map<String, String> map = new HashMap<>();

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Wed Aug 28 07:32:23 2019 -0400
@@ -65,7 +65,7 @@
             "jdk.jpackage.internal.resources.MacResources");
 
     private static final String LIBRARY_NAME = "libapplauncher.dylib";
-    private static final String TEMPLATE_BUNDLE_ICON = "GenericApp.icns";
+    private static final String TEMPLATE_BUNDLE_ICON = "java.icns";
     private static final String OS_TYPE_CODE = "APPL";
     private static final String TEMPLATE_INFO_PLIST_LITE =
             "Info-lite.plist.template";

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java	Wed Aug 28 07:32:23 2019 -0400
@@ -45,8 +45,7 @@
     private static final ResourceBundle I18N = ResourceBundle.getBundle(
             "jdk.jpackage.internal.resources.MacResources");
 
-    private static final String TEMPLATE_BUNDLE_ICON_HIDPI =
-            "GenericAppHiDPI.icns";
+    private static final String TEMPLATE_BUNDLE_ICON_HIDPI = "java.icns";
     private final static String DEFAULT_ENTITLEMENTS =
             "MacAppStore.entitlements";
     private final static String DEFAULT_INHERIT_ENTITLEMENTS =

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java	Wed Aug 28 07:32:23 2019 -0400
@@ -39,7 +39,7 @@
 
     static final String DEFAULT_BACKGROUND_IMAGE="background_dmg.png";
     static final String DEFAULT_DMG_SETUP_SCRIPT="DMGsetup.scpt";
-    static final String TEMPLATE_BUNDLE_ICON = "GenericApp.icns";
+    static final String TEMPLATE_BUNDLE_ICON = "java.icns";
 
     static final String DEFAULT_LICENSE_PLIST="lic_template.plist";
 

--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java	Wed Aug 28 07:32:23 2019 -0400
@@ -55,7 +55,7 @@
     private static final ResourceBundle I18N = ResourceBundle.getBundle(
             "jdk.jpackage.internal.resources.MacResources");
 
-    private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png";
+    private static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.png";
 
     private static final String TEMPLATE_PREINSTALL_SCRIPT =
             "preinstall.template";

Binary file src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/GenericApp.icns has changed

Binary file src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/GenericAppHiDPI.icns has changed

Binary file src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_pkg.png has changed

Binary file src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/java.icns has changed

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java	Mon Aug 19 21:17:25 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java	Wed Aug 28 07:32:23 2019 -0400
@@ -66,7 +66,7 @@
     private final static String REDIST_MSVCR = "vcruntimeVS_VER.dll";
     private final static String REDIST_MSVCP = "msvcpVS_VER.dll";
 
-    private final static String TEMPLATE_APP_ICON ="javalogo_white_48.ico";
+    private final static String TEMPLATE_APP_ICON ="java48.ico";
 
     private static final String EXECUTABLE_PROPERTIES_TEMPLATE =
             "WinLauncher.template";

Binary file src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/icon_inno_setup.bmp has changed

Binary file src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/java48.ico has changed

Binary file src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/javalogo_white_48.ico has changed