diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java
new file mode 100644
index 00000000000..83e98940b5b
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. 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;
+
+// BUNCH: 182
+// todo: inline when remove
+
+public interface IconExtensionChooser {
+    static String iconExtension() {
+        return "svg";
+    }
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182
new file mode 100644
index 00000000000..29a2fd09643
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/IconExtensionChooser.java.182
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. 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;
+
+// BUNCH: 182
+
+public interface IconExtensionChooser {
+    static String iconExtension() {
+        return "png";
+    }
+}
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 bb21b343724..8b279b971b2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
@@ -22,41 +22,41 @@ import com.intellij.util.PlatformIcons;
 import javax.swing.*;
 
 public interface KotlinIcons {
-    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.svg");
-    Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin24.svg");
+    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin." + IconExtensionChooser.iconExtension());
 
-    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.svg");
+    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13." + IconExtensionChooser.iconExtension());
 
-    Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.svg");
-    Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin.svg");
-    Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.svg");
-    Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.svg");
-    Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script.svg");
-    Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.svg");
-    Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg");
-    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.svg");
-    Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.svg");
-    Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin.svg");
-    Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.svg");
+    Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin." + IconExtensionChooser.iconExtension());
+    Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin." + IconExtensionChooser.iconExtension());
+    Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin." + IconExtensionChooser.iconExtension());
+    Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file." + IconExtensionChooser.iconExtension());
+    Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script." + IconExtensionChooser.iconExtension());
+    Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script." + IconExtensionChooser.iconExtension());
+    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin." + IconExtensionChooser.iconExtension());
+    Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin." + IconExtensionChooser.iconExtension());
+    Icon ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/annotationKotlin." + IconExtensionChooser.iconExtension());
+    // BUNCH: 182
+    //todo: Use AllIcons.nodes instead (actually the same icon)
+    Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function." + IconExtensionChooser.iconExtension());
     Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON;
-    Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function.svg");
-    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.svg");
+    Icon ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function." + IconExtensionChooser.iconExtension());
+    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda." + IconExtensionChooser.iconExtension());
     Icon VAR = PlatformIcons.VARIABLE_ICON;
-    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.svg");
+    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value." + IconExtensionChooser.iconExtension());
     Icon PARAMETER = PlatformIcons.PARAMETER_ICON;
-    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.svg");
-    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.svg");
-    Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.svg");
-    Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.svg");
+    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value." + IconExtensionChooser.iconExtension());
+    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable." + IconExtensionChooser.iconExtension());
+    Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin." + IconExtensionChooser.iconExtension());
+    Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias." + IconExtensionChooser.iconExtension());
 
-    Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.svg");
+    Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall." + IconExtensionChooser.iconExtension());
 
-    Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.svg");
-    Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.svg");
+    Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual." + IconExtensionChooser.iconExtension());
+    Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect." + IconExtensionChooser.iconExtension());
 
-    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.svg");
+    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration." + IconExtensionChooser.iconExtension());
 
-    Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.svg");
-    Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.svg");
+    Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js." + IconExtensionChooser.iconExtension());
+    Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project." + IconExtensionChooser.iconExtension());
     Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg");
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182
deleted file mode 100644
index b450d08f956..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java.182
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-
-package org.jetbrains.kotlin.idea;
-
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.util.PlatformIcons;
-
-import javax.swing.*;
-
-public interface KotlinIcons {
-    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.png");
-    Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin24.png");
-
-    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.png");
-
-    Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.png");
-    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");
-    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 ABSTRACT_EXTENSION_FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstract_extension_function.png");
-    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.png");
-    Icon VAR = PlatformIcons.VARIABLE_ICON;
-    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.png");
-    Icon PARAMETER = PlatformIcons.PARAMETER_ICON;
-    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.png");
-    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.png");
-    Icon CLASS_INITIALIZER = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classInitializerKotlin.png");
-    Icon TYPE_ALIAS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/typeAlias.png");
-
-    Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.png");
-
-    Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.png");
-    Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.png");
-
-    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png");
-
-    Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.png");
-    Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.png");
-    Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg");
-}
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.png
deleted file mode 100755
index 5687a064e43..00000000000
Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg
deleted file mode 100644
index 27bbb434fd9..00000000000
--- a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <defs>
-    <linearGradient id="kotlin24-a" x1="-16.836%" x2="76.219%" y1="91.94%" y2="-1.116%">
-      <stop offset="10.75%" stop-color="#C757BC"/>
-      <stop offset="21.38%" stop-color="#D0609A"/>
-      <stop offset="42.54%" stop-color="#E1725C"/>
-      <stop offset="60.48%" stop-color="#EE7E2F"/>
-      <stop offset="74.3%" stop-color="#F58613"/>
-      <stop offset="82.32%" stop-color="#F88909"/>
-    </linearGradient>
-  </defs>
-  <g fill="none" transform="translate(1 1)">
-    <polygon fill="#0EAEFF" points="0 22 11.037 10.963 22 22"/>
-    <polygon fill="#0EAEFF" points="0 0 11.037 0 0 11.917"/>
-    <path fill="url(#kotlin24-a)" d="M11.0366667,0 L22,0 L11.0366667,10.9633333 L0,22 L0,11.6233333 L11.0366667,0 Z"/>
-  </g>
-</svg>
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24@2x.png
deleted file mode 100755
index 0390ac95c10..00000000000
Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin24@2x.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png
deleted file mode 100644
index 99c9ec04fb6..00000000000
Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png and /dev/null differ
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg
deleted file mode 100644
index 285635ea565..00000000000
--- a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="kotlin_activity-a" x1="-16.836%" x2="76.219%" y1="91.94%" y2="-1.116%">
-      <stop offset="10.75%" stop-color="#C757BC"/>
-      <stop offset="21.38%" stop-color="#D0609A"/>
-      <stop offset="42.54%" stop-color="#E1725C"/>
-      <stop offset="60.48%" stop-color="#EE7E2F"/>
-      <stop offset="74.3%" stop-color="#F58613"/>
-      <stop offset="82.32%" stop-color="#F88909"/>
-    </linearGradient>
-  </defs>
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#A4C639" d="M8,12.5 L7,12.5 L7,14.4970707 C7,15.0509732 6.55613518,15.5 6,15.5 C5.44771525,15.5 5,15.0621186 5,14.4970707 L5,12.5 L4,12.5 L4,5.5 L12,5.5 L12,8 L8,8 L8,12.5 Z M14.3999999,8 L12.6999998,8 L12.6999998,6.359375 C12.6999998,5.88475529 13.0772849,5.5 13.5499998,5.5 C14.0194419,5.5 14.3999999,5.87803727 14.3999999,6.359375 L14.3999999,8 Z M11,2.6175411 C11.6223634,3.18583005 12,3.98555353 12,5 L4,5 C4,3.98555353 4.37763659,3.18583005 5,2.6175411 L5,0.5 L6,0.5 L6,1.98239228 C6.58834673,1.72952773 7.27142571,1.60000002 8,1.60000002 C8.72857429,1.60000002 9.41165327,1.72952773 10,1.98239228 L10,0.5 L11,0.5 L11,2.6175411 Z M10,3 L9,3 L9,4 L10,4 L10,3.5 L10,3 Z M6,3.5 L6,4 L7,4 L7,3 L6,3 L6,3.5 Z M1.60000002,6.359375 C1.60000002,5.88475529 1.97728513,5.5 2.45000005,5.5 C2.9194421,5.5 3.30000007,5.87803727 3.30000007,6.359375 L3.30000007,10.140625 C3.30000007,10.6152447 2.92271496,11 2.45000005,11 C1.980558,11 1.60000002,10.6219627 1.60000002,10.140625 L1.60000002,6.359375 Z"/>
-    <g transform="translate(9 9)">
-      <polygon fill="#0EAEFF" fill-rule="nonzero" points="0 7 3.512 3.488 7 7"/>
-      <polygon fill="#0EAEFF" fill-rule="nonzero" points="0 0 3.512 0 0 3.792"/>
-      <polygon fill="url(#kotlin_activity-a)" fill-rule="nonzero" points="3.512 0 0 3.698 0 7 3.512 3.488 7 0"/>
-    </g>
-  </g>
-</svg>
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png
deleted file mode 100644
index 7c5e2a97f15..00000000000
Binary files a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png and /dev/null differ