diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png
new file mode 100644
index 00000000000..84cfb2aadd5
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png
new file mode 100644
index 00000000000..403a4e89325
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_13.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_13.png
new file mode 100644
index 00000000000..ad4ca9cbb87
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_13.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png
new file mode 100644
index 00000000000..ab1407bb717
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png differ
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 20edfcd71ec..702cd766e88 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -172,7 +172,7 @@
       <toolWindow id="Kotlin"
                   factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
                   anchor="right"
-                  icon="/org/jetbrains/jet/plugin/icons/kotlin13x13.png"
+                  icon="/org/jetbrains/jet/plugin/icons/kotlin_13.png"
               />
 
       <intentionAction>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
index 1317a34b943..862eea63b29 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
@@ -92,7 +92,7 @@ public final class JetDescriptorIconProvider {
                 case OBJECT:
                     return JetIcons.OBJECT;
                 case CLASS:
-                    return PlatformIcons.CLASS_ICON;
+                    return JetIcons.CLASS;
                 default:
                     LOG.warn("No icon for descriptor: " + descriptor);
                     return null;
diff --git a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
index a237db389ea..1449d48d69e 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
@@ -73,7 +73,7 @@ public class JetIconProvider extends IconProvider {
                 return JetIcons.TRAIT;
             }
 
-            Icon icon = jetClass.hasModifier(JetTokens.ENUM_KEYWORD) ? PlatformIcons.ENUM_ICON : PlatformIcons.CLASS_ICON;
+            Icon icon = jetClass.hasModifier(JetTokens.ENUM_KEYWORD) ? PlatformIcons.ENUM_ICON : JetIcons.CLASS;
             if (jetClass instanceof JetEnumEntry) {
                 JetEnumEntry enumEntry = (JetEnumEntry) jetClass;
                 if (enumEntry.getPrimaryConstructorParameterList() == null) {
diff --git a/idea/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/src/org/jetbrains/jet/plugin/JetIcons.java
index 8e9969cec3f..9b61eb3e9d6 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetIcons.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetIcons.java
@@ -26,6 +26,7 @@ import javax.swing.*;
 public interface JetIcons {
     Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin16x16.png");
 
+    Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/class_kotlin.png");
     Icon FILE = SMALL_LOGO; // TODO: Add file icon
     Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png");
     Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png");
@@ -36,4 +37,6 @@ public interface JetIcons {
     Icon PARAMETER = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/parameter.png");
     Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_value.png");
     Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_variable.png");
+
+    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png");
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
index 1e1321f2836..31e7868df1e 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
@@ -23,6 +23,7 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.jet.plugin.JetIcons;
 
 /**
  * @author Nikolay Krasko
@@ -37,8 +38,8 @@ public class NewKotlinFileAction extends CreateFileFromTemplateAction {
         builder
                 .setTitle(JetBundle.message("new.kotlin.file.action"))
                 .addKind("Kotlin file", JetFileType.INSTANCE.getIcon(), "Kotlin File")
-                .addKind("Class", PlatformIcons.CLASS_ICON, "Kotlin Class")
-                .addKind("Trait", PlatformIcons.INTERFACE_ICON, "Kotlin Trait")
+                .addKind("Class", JetIcons.CLASS, "Kotlin Class")
+                .addKind("Trait", JetIcons.TRAIT, "Kotlin Trait")
                 .addKind("Enum class", PlatformIcons.ENUM_ICON, "Kotlin Enum");
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java
index f055c3a86ec..21bd928fa72 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java
@@ -21,7 +21,7 @@ import com.intellij.execution.configurations.ConfigurationTypeBase;
 import com.intellij.execution.configurations.ConfigurationTypeUtil;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.jet.plugin.JetIcons;
 
 /**
  * @author Pavel Talanov
@@ -32,7 +32,7 @@ public final class K2JSRunConfigurationType extends ConfigurationTypeBase {
     }
 
     public K2JSRunConfigurationType() {
-        super("K2JSConfigurationType", "K2JS", "Kotlin to Javascript configuration", JetFileType.INSTANCE.getIcon());
+        super("K2JSConfigurationType", "K2JS", "Kotlin to Javascript configuration", JetIcons.LAUNCH);
         addFactory(new K2JSConfigurationFactory());
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java
index e698deed70c..8d08fb898b5 100644
--- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java
+++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.run;
 import com.intellij.execution.configurations.*;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.jet.plugin.JetIcons;
 
 /**
  * @author yole
@@ -30,7 +30,7 @@ public class JetRunConfigurationType extends ConfigurationTypeBase {
     }
 
     public JetRunConfigurationType() {
-        super("JetRunConfigurationType", "Kotlin", "Kotlin", JetFileType.INSTANCE.getIcon());
+        super("JetRunConfigurationType", "Kotlin", "Kotlin", JetIcons.LAUNCH);
         addFactory(new JetRunConfigurationFactory(this));
     }