diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin.png
new file mode 100644
index 00000000000..78c2afb89a2
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x.png
new file mode 100644
index 00000000000..6f6a441079d
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x_dark.png
new file mode 100644
index 00000000000..d435e586e34
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin_dark.png
new file mode 100644
index 00000000000..0f90b140198
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png
deleted file mode 100644
index 8de6b24d0fb..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin.png
new file mode 100644
index 00000000000..84f59ca9863
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x.png
new file mode 100644
index 00000000000..1501e41ed14
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x_dark.png
new file mode 100644
index 00000000000..3f5344f369b
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin_dark.png
new file mode 100644
index 00000000000..5d04f7a19d8
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png
deleted file mode 100644
index 43a53540805..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/enum_kotlin.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png
index 403a4e89325..7ccfa484781 100644
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13.png
new file mode 100644
index 00000000000..6918b0f5212
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13@2x.png
new file mode 100644
index 00000000000..b1667cea254
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13x13.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13x13.png
deleted file mode 100644
index 2510d022cc8..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13x13.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin16x16.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin16x16.png
deleted file mode 100644
index a9a0f871b53..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin16x16.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin@2x.png
new file mode 100644
index 00000000000..0486b6ab946
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin@2x.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
deleted file mode 100644
index ad4ca9cbb87..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_13.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png
index 00ca1072485..1e00ac188a3 100644
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x.png
new file mode 100644
index 00000000000..1646f3f62e3
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x_dark.png
new file mode 100644
index 00000000000..5d5bfad9fd5
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file_dark.png
new file mode 100644
index 00000000000..352247f0ab9
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file_dark.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
index ab1407bb717..c461845b06a 100644
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x.png
new file mode 100644
index 00000000000..cbb7ed771c1
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x_dark.png
new file mode 100644
index 00000000000..882537a25ce
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration_dark.png
new file mode 100644
index 00000000000..9fcf9cf1d1c
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/object.png b/idea/resources/org/jetbrains/jet/plugin/icons/object.png
deleted file mode 100644
index c8d4a8aa334..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/object.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin.png
new file mode 100644
index 00000000000..98a5af0301f
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x.png
new file mode 100644
index 00000000000..a7f7cc3f809
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x_dark.png
new file mode 100644
index 00000000000..2fb59510f7d
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin_dark.png
new file mode 100644
index 00000000000..95bfa4a4022
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/parameter.png b/idea/resources/org/jetbrains/jet/plugin/icons/parameter.png
deleted file mode 100644
index 1278ae24deb..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/parameter.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/trait.png b/idea/resources/org/jetbrains/jet/plugin/icons/trait.png
deleted file mode 100644
index 860fa3f341a..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/trait.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin.png
new file mode 100644
index 00000000000..fe77edfa20a
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x.png b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x.png
new file mode 100644
index 00000000000..96dfd969eaf
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x_dark.png
new file mode 100644
index 00000000000..11e1afdcebf
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin_dark.png b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin_dark.png
new file mode 100644
index 00000000000..fa29550504a
Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin_dark.png differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/type_alias.png b/idea/resources/org/jetbrains/jet/plugin/icons/type_alias.png
deleted file mode 100644
index 65a75f020df..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/type_alias.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/variable.png b/idea/resources/org/jetbrains/jet/plugin/icons/variable.png
deleted file mode 100644
index 7312fe47d3b..00000000000
Binary files a/idea/resources/org/jetbrains/jet/plugin/icons/variable.png and /dev/null differ
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 6263b83be86..190e0d0f799 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -274,7 +274,7 @@
     <toolWindow id="Kotlin"
                 factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
                 anchor="right"
-                icon="/org/jetbrains/jet/plugin/icons/kotlin_13.png"
+                icon="/org/jetbrains/jet/plugin/icons/kotlin13.png"
         />
 
     <applicationService serviceInterface="org.jetbrains.jet.plugin.editor.JetEditorOptions"
diff --git a/idea/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/src/org/jetbrains/jet/plugin/JetIcons.java
index 8da9364cf2e..8d8c5f6ada7 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetIcons.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetIcons.java
@@ -26,17 +26,17 @@ public interface JetIcons {
 
     Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_13.png");
 
-    Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/class_kotlin.png");
-    Icon ENUM = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/enum_kotlin.png");
+    Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/classKotlin.png");
+    Icon ENUM = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/enumKotlin.png");
     Icon FILE = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png");
-    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png");
-    Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png");
+    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/objectKotlin.png");
+    Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/traitKotlin.png");
     Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/function.png");
     Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON;
     Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/lambda.png");
-    Icon VAR = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/variable.png");
+    Icon VAR = PlatformIcons.VARIABLE_ICON;
     Icon VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/value.png");
-    Icon PARAMETER = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/parameter.png");
+    Icon PARAMETER = PlatformIcons.PARAMETER_ICON;
     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");