diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
index 72ea2565020..ddc45d7d996 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
@@ -39,6 +39,12 @@ import javax.swing.Icon
 class KotlinIconProvider : IconProvider(), DumbAware {
     override fun getIcon(psiElement: PsiElement, flags: Int): Icon? {
         if (psiElement is KtFile) {
+            if (psiElement.isScript()) {
+                return when {
+                    psiElement.name.endsWith(".gradle.kts") -> KotlinIcons.GRADLE_SCRIPT
+                    else -> KotlinIcons.SCRIPT
+                }
+            }
             val mainClass = getSingleClass(psiElement)
             return if (mainClass != null) getIcon(mainClass, flags) else KotlinIcons.FILE
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
index 08f121adcf1..d6950b496d0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
@@ -31,6 +31,8 @@ public interface KotlinIcons {
     Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin.png");
     Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.png");
     Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png");
+    Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script.png");
+    Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png");
     Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.png");
     Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.png");
     Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png");
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file.png
index d6f2e6c7fbc..10626a00078 100755
Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file.png and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file.png differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file@2x.png
index 132848ea766..bdf9921c08d 100755
Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file@2x.png and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file@2x.png differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png
new file mode 100644
index 00000000000..4ee5ed4c31d
Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png
new file mode 100644
index 00000000000..a99be88744b
Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script.png
new file mode 100644
index 00000000000..dfb6cd01b80
Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script.png differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script@2x.png
new file mode 100644
index 00000000000..3299f592d55
Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script@2x.png differ
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
index 374a3290e10..7354f4a1fab 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
@@ -13,13 +13,13 @@ import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.idea.KotlinFileType
+import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.psi.KtFile
 
 class NewKotlinScriptAction : CreateFileFromTemplateAction(
     "Kotlin Script",
     "Creates new Kotlin script",
-    KotlinFileType.INSTANCE.icon
+    KotlinIcons.SCRIPT
 ), DumbAware {
 
     override fun postProcess(createdElement: PsiFile, templateName: String?, customProperties: Map<String, String>?) {
@@ -34,7 +34,7 @@ class NewKotlinScriptAction : CreateFileFromTemplateAction(
 
     override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
         builder.setTitle("New Kotlin Script")
-            .addKind("Kotlin Script", KotlinFileType.INSTANCE.icon, "Kotlin Script")
+            .addKind("Kotlin Script", KotlinIcons.SCRIPT, "Kotlin Script")
     }
 
     override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) =