diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
index 075a070180d..ac0b8308f74 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
@@ -102,7 +102,7 @@ public final class KotlinDescriptorIconProvider {
         if (descriptor instanceof ClassDescriptor) {
             switch (((ClassDescriptor) descriptor).getKind()) {
                 case INTERFACE:
-                    return KotlinIcons.TRAIT;
+                    return KotlinIcons.INTERFACE;
                 case ENUM_CLASS:
                     return KotlinIcons.ENUM;
                 case ENUM_ENTRY:
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 dc5d22ba11d..1f5f7b80bc0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
@@ -99,8 +99,9 @@ class KotlinIconProvider : IconProvider(), DumbAware {
             }
             is KtFunctionLiteral -> KotlinIcons.LAMBDA
             is KtClass -> when {
-                isInterface() -> KotlinIcons.TRAIT
+                isInterface() -> KotlinIcons.INTERFACE
                 isEnum() -> KotlinIcons.ENUM
+                isAnnotation() -> KotlinIcons.ANNOTATION
                 this is KtEnumEntry && getPrimaryConstructorParameterList() == null -> KotlinIcons.ENUM
                 else -> KotlinIcons.CLASS
             }
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 0b2e6255b33..507a49c1f3b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
@@ -32,7 +32,8 @@ public interface KotlinIcons {
     Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.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 TRAIT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png");
+    Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png");
+    Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin.png");
     Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.png");
     Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON;
     Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.png");
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin.png b/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin.png
new file mode 100644
index 00000000000..c8272a616e1
Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin.png differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin@2x.png
new file mode 100644
index 00000000000..4fe9ba0bea0
Binary files /dev/null and b/idea/resources/org/jetbrains/kotlin/idea/icons/annotationKotlin@2x.png differ
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
index b5f7682e770..903e97ac036 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
@@ -58,7 +58,7 @@ public class NewKotlinFileAction extends CreateFileFromTemplateAction implements
                 .setTitle("New Kotlin File/Class")
                 .addKind("File", KotlinFileType.INSTANCE.getIcon(), "Kotlin File")
                 .addKind("Class", KotlinIcons.CLASS, "Kotlin Class")
-                .addKind("Interface", KotlinIcons.TRAIT, "Kotlin Interface")
+                .addKind("Interface", KotlinIcons.INTERFACE, "Kotlin Interface")
                 .addKind("Enum class", KotlinIcons.ENUM, "Kotlin Enum")
                 .addKind("Object", KotlinIcons.OBJECT, "Kotlin Object");
     }