diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.form b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.form
index c50b4c6b0b79..8cbff4bab10c 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.form
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.form
@@ -13,7 +13,8 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Linux Icon"/>
+          <labelFor value="153bd"/>
+          <text value="&amp;Linux Icon"/>
         </properties>
       </component>
       <vspacer id="3b423">
@@ -32,7 +33,8 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Mac Icon"/>
+          <labelFor value="4c06e"/>
+          <text value="&amp;Mac Icon"/>
         </properties>
       </component>
       <component id="4c06e" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myMacIconPath">
@@ -46,7 +48,8 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Windows Icon"/>
+          <labelFor value="8c868"/>
+          <text value="&amp;Windows Icon"/>
         </properties>
       </component>
       <component id="8c868" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myWindowsIconPath">
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.java
index 735ef3993a49..41257cb02be9 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxApplicationIconsDialog.java
@@ -28,9 +28,9 @@ public class JavaFxApplicationIconsDialog extends DialogWrapper {
     init();
 
     if (icons != null) {
-      myPanel.myLinuxIconPath.setText(icons.getLinuxIcon());
-      myPanel.myMacIconPath.setText(icons.getMacIcon());
-      myPanel.myWindowsIconPath.setText(icons.getWindowsIcon());
+      setSystemDependentPath(myPanel.myLinuxIconPath, icons.getLinuxIcon());
+      setSystemDependentPath(myPanel.myMacIconPath, icons.getMacIcon());
+      setSystemDependentPath(myPanel.myWindowsIconPath, icons.getWindowsIcon());
     }
 
     addBrowseListener(myPanel.myLinuxIconPath, "png", project);
@@ -71,6 +71,10 @@ public class JavaFxApplicationIconsDialog extends DialogWrapper {
     return FileUtil.toSystemIndependentName(text.trim());
   }
 
+  private static void setSystemDependentPath(TextFieldWithBrowseButton withBrowseButton, String path) {
+    withBrowseButton.setText(!StringUtil.isEmptyOrSpaces(path) ? FileUtil.toSystemDependentName(path) : "");
+  }
+
   private boolean isValidPath(TextFieldWithBrowseButton withBrowseButton, ProjectFileIndex index, String osName) {
     final String text = withBrowseButton.getText();
     if (StringUtil.isEmptyOrSpaces(text)) return true;