diff --git a/idea/resources-en/messages/KotlinBundle.properties b/idea/resources-en/messages/KotlinBundle.properties
index bfeb8293ca5..bb898c4a148 100644
--- a/idea/resources-en/messages/KotlinBundle.properties
+++ b/idea/resources-en/messages/KotlinBundle.properties
@@ -336,9 +336,9 @@ action.generate.tostring.template.multiple=Multiple templates with concatenation
 action.generate.tostring.choose.implementation=Choose implementation:
 action.generate.tostring.generate.super.call=Generate call to super.toString()
 
-action.new.file.text=Kotlin File/Class
-action.new.file.description=Creates new Kotlin file or class
-action.new.file.dialog.title=New Kotlin File/Class
+action.new.file.text=Kotlin Class/File
+action.new.file.description=Creates new Kotlin class or file
+action.new.file.dialog.title=New Kotlin Class/File
 action.new.file.dialog.file.title=File
 action.new.file.dialog.class.title=Class
 action.new.file.dialog.interface.title=Interface
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
index 3c2e65abbc8..4d6b5194625 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.idea.actions
@@ -87,16 +76,16 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
 
     override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
         builder.setTitle(KotlinBundle.message("action.new.file.dialog.title"))
-            .addKind(
-                KotlinBundle.message("action.new.file.dialog.file.title"),
-                KotlinFileType.INSTANCE.icon,
-                "Kotlin File"
-            )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.class.title"),
                 KotlinIcons.CLASS,
                 "Kotlin Class"
             )
+            .addKind(
+                KotlinBundle.message("action.new.file.dialog.file.title"),
+                KotlinFileType.INSTANCE.icon,
+                "Kotlin File"
+            )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.interface.title"),
                 KotlinIcons.INTERFACE,