diff --git a/plugins/editorconfig/resources/messages/EditorConfigBundle.properties b/plugins/editorconfig/resources/messages/EditorConfigBundle.properties
index 2cbd48bc8b68..aa7f976c8f36 100644
--- a/plugins/editorconfig/resources/messages/EditorConfigBundle.properties
+++ b/plugins/editorconfig/resources/messages/EditorConfigBundle.properties
@@ -211,7 +211,7 @@ editor.preview.not.saved.warning=Preview changes will not be saved to the actual
 editor.preview.open=Open File to Preview Code Style...
 export.topmost.file=Add "root=true" to the beginning of the file
 export.properties.title=Property Sets
-export.properties.standard=EditorConfig Standard
+export.properties.standard=EditorConfig standard
 export.properties.intellij=IntelliJ IDEA-specific
 export.languages.title=Add properties for:
 export.comment.out.properties=Add properties as comments
diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.form b/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.form
index bf6d4ce8ff01..63aa201f8e3c 100644
--- a/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.form
+++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.form
@@ -90,11 +90,13 @@
           </component>
         </children>
       </grid>
-      <component id="c369c" class="com.intellij.ui.HyperlinkLabel" binding="myAboutEditorConfigLink" custom-create="true">
+      <component id="d3f75" class="javax.swing.JLabel" binding="myAboutEditorConfigLink" custom-create="true">
         <constraints>
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <text resource-bundle="messages/EditorConfigBundle" key="export.editor.config.about"/>
+        </properties>
       </component>
       <grid id="d121c" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java
index 683ce84ff770..039016fedf85 100644
--- a/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java
+++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/create/CreateEditorConfigForm.java
@@ -2,19 +2,20 @@
 package org.editorconfig.configmanagement.create;
 
 import com.intellij.application.options.CodeStyle;
+import com.intellij.icons.AllIcons;
+import com.intellij.ide.BrowserUtil;
 import com.intellij.lang.Language;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
 import com.intellij.ui.ContextHelpLabel;
-import com.intellij.ui.HyperlinkLabel;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.components.labels.LinkLabel;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.ui.JBDimension;
-import com.intellij.util.ui.SwingHelper;
 import org.editorconfig.language.messages.EditorConfigBundle;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,7 +37,7 @@ public class CreateEditorConfigForm {
   private JBCheckBox       myCommentProperties;
   private JBLabel          myAddPropertiesForLabel;
   @SuppressWarnings("unused")
-  private HyperlinkLabel   myAboutEditorConfigLink;
+  private JLabel           myAboutEditorConfigLink;
   @SuppressWarnings("unused")
   private ContextHelpLabel myContextHelpLabel;
 
@@ -127,9 +128,13 @@ public class CreateEditorConfigForm {
   }
 
   private void createUIComponents() {
-    myAboutEditorConfigLink = SwingHelper.createWebHyperlink(
-      EditorConfigBundle.message("export.editor.config.about"),
-      "http://www.editorconfig.org");
+    myAboutEditorConfigLink =
+      new LinkLabel<>(
+        EditorConfigBundle.message("export.editor.config.about"),
+        AllIcons.Ide.External_link_arrow,
+        (_0, _1) -> BrowserUtil.browse("http://www.editorconfig.org"));
+    myAboutEditorConfigLink.setIconTextGap(0);
+    myAboutEditorConfigLink.setHorizontalTextPosition(SwingConstants.LEFT);
     myContextHelpLabel = ContextHelpLabel.create("", EditorConfigBundle.message("export.editor.config.root.help"));
   }