[kotlin] KotlinIcons clean up

Move drop redundant Kotlin icons classes
Move icon resources to the same module as KotlinIcons

Relates to #KTIJ-19184

GitOrigin-RevId: 34d2736c33edf40632c061c915d4dad54bc1503a

build/tasks/resources/linux/class-report.txt

@@ -13498,7 +13498,7 @@ org/jetbrains/kotlin/console/actions/RunKotlinConsoleAction.class:plugins/Kotlin
 org/jetbrains/kotlin/psi/KtContinueExpression.class:plugins/Kotlin/lib/kotlinc_kotlin-compiler.jar
 com/intellij/util/io/storage/AbstractStorage$AppenderStream.class:lib/util.jar
 com/siyeh/ig/callMatcher/CallMatcher$Simple.class:plugins/java/lib/java-impl.jar
-icons/KotlinIdeaIcons.class:plugins/Kotlin/lib/kotlin-plugin.jar
+icons/KotlinIcons.class:plugins/Kotlin/lib/kotlin-plugin.jar
 org/jetbrains/kotlin/psi/KtBreakExpression.class:plugins/Kotlin/lib/kotlinc_kotlin-compiler.jar
 com/intellij/psi/PsiCall.class:plugins/java/lib/java-api.jar
 com/intellij/formatting/fileSet/FileSetDescriptor$State.class:lib/platform-api.jar

build/tasks/resources/mac/class-report.txt

@@ -11998,7 +11998,7 @@ com/intellij/psi/stubs/EmptyStubElementType.class:lib/platform-api.jar
 org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrAnnotationArgumentListElementType.class:plugins/Groovy/lib/Groovy.jar
 com/intellij/javascript/nodejs/library/NodeModulesExcludePolicy.class:plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar
 org/jetbrains/kotlin/console/actions/RunKotlinConsoleAction.class:plugins/Kotlin/lib/kotlin-plugin.jar
-icons/KotlinIdeaIcons.class:plugins/Kotlin/lib/kotlin-plugin.jar
+icons/KotlinIcons.class:plugins/Kotlin/lib/kotlin-plugin.jar
 com/intellij/psi/PsiAnnotationParameterList.class:plugins/java/lib/java-api.jar
 org/jetbrains/plugins/groovy/lang/psi/api/auxiliary/modifiers/annotation/GrAnnotationArgumentList.class:plugins/Groovy/lib/Groovy.jar
 com/jetbrains/rd/platform/codeWithMe/editors/CodeWithMeEditorService$Companion.class:plugins/cwm-plugin/lib/cwm-common.jar

build/tasks/resources/windows/class-report.txt

@@ -10566,7 +10566,7 @@ org/jetbrains/idea/maven/utils/MavenMergingUpdateQueue.class:plugins\maven\lib\m
 org/jetbrains/kotlin/console/actions/RunKotlinConsoleAction.class:plugins\Kotlin\lib\kotlin-plugin.jar
 com/sun/xml/bind/v2/runtime/property/ArrayReferenceNodeProperty$MixedTextLoader.class:lib\platform-impl.jar
 com/sun/xml/bind/v2/runtime/property/PropertyFactory$1.class:lib\platform-impl.jar
-icons/KotlinIdeaIcons.class:plugins\Kotlin\lib\kotlin-plugin.jar
+icons/KotlinIcons.class:plugins\Kotlin\lib\kotlin-plugin.jar
 com/sun/xml/bind/v2/runtime/Name.class:lib\platform-impl.jar
 com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.class:lib\platform-impl.jar
 com/intellij/build/ViewManager.class:lib\platform-api.jar

plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java

@@ -1,70 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea;
-
-import com.intellij.icons.AllIcons;
-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.svg");
-
-    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.svg");
-
-    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 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 = AllIcons.Nodes.Function;
-    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 VAR = PlatformIcons.VARIABLE_ICON;
-    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.svg");
-    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 DSL_MARKER_ANNOTATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/dslMarkerAnnotation.svg");
-
-    Icon SUSPEND_CALL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/suspendCall.svg");
-
-    Icon ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.svg");
-    Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.svg");
-
-    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.svg");
-    Icon LOAD_SCRIPT_CONFIGURATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/loadScriptConfiguration.svg");
-
-    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 NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg");
-
-    interface Wizard {
-        Icon JVM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/jvm.svg");
-        Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/js.svg");
-        Icon CONSOLE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/console.svg");
-        Icon MULTIPLATFORM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatform.svg");
-        Icon MULTIPLATFORM_LIBRARY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatformLibrary.svg");
-        Icon MULTIPLATFORM_MOBILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobile.svg");
-        Icon MULTIPLATFORM_MOBILE_LIBRARY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobileLibrary.svg");
-        Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/native.svg");
-        Icon WEB = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/ppWeb.svg");
-        Icon ANDROID = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/android.svg");
-        Icon IOS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/ios.svg");
-        Icon LINUX = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/linux.svg");
-        Icon MAC_OS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/macOS.svg");
-        Icon WINDOWS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/windows.svg");
-        Icon NODE_JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/nodejs.svg");
-        Icon REACT_JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/react.svg");
-        Icon COMPOSE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/wizard/compose.svg");
-    }
-}

plugins/kotlin/completion/src/icons/KotlinIdeaIcons.java

@@ -1,63 +0,0 @@
-package icons;
-
-import com.intellij.ui.IconManager;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-
-/**
- * NOTE THIS FILE IS AUTO-GENERATED
- * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
- */
-public final class KotlinIdeaIcons {
-  private static @NotNull Icon load(@NotNull String path, long cacheKey, int flags) {
-    return IconManager.getInstance().loadRasterizedIcon(path, KotlinIdeaIcons.class.getClassLoader(), cacheKey, flags);
-  }
-  /** 16x16 */ public static final @NotNull Icon Abstract_extension_function = load("org/jetbrains/kotlin/idea/icons/abstract_extension_function.svg", 7417679411263450358L, 0);
-  /** 16x16 */ public static final @NotNull Icon AbstractClassKotlin = load("org/jetbrains/kotlin/idea/icons/abstractClassKotlin.svg", 6118422021574552028L, 0);
-  /** 16x16 */ public static final @NotNull Icon Actual = load("org/jetbrains/kotlin/idea/icons/actual.svg", -4727863439746678606L, 0);
-  /** 16x16 */ public static final @NotNull Icon AnnotationKotlin = load("org/jetbrains/kotlin/idea/icons/annotationKotlin.svg", 1981410558175520747L, 0);
-  /** 16x16 */ public static final @NotNull Icon ClassInitializerKotlin = load("org/jetbrains/kotlin/idea/icons/classInitializerKotlin.svg", 428407677003035493L, 0);
-  /** 16x16 */ public static final @NotNull Icon ClassKotlin = load("org/jetbrains/kotlin/idea/icons/classKotlin.svg", -4723898843334724017L, 0);
-  /** 12x12 */ public static final @NotNull Icon DslMarkerAnnotation = load("org/jetbrains/kotlin/idea/icons/dslMarkerAnnotation.svg", 5574692736776531477L, 2);
-  /** 16x16 */ public static final @NotNull Icon EnumKotlin = load("org/jetbrains/kotlin/idea/icons/enumKotlin.svg", -8462447318313336813L, 0);
-  /** 16x16 */ public static final @NotNull Icon Expect = load("org/jetbrains/kotlin/idea/icons/expect.svg", -2910408808136595896L, 1);
-  /** 16x16 */ public static final @NotNull Icon Field_value = load("org/jetbrains/kotlin/idea/icons/field_value.svg", 173519203061099646L, 0);
-  /** 16x16 */ public static final @NotNull Icon Field_variable = load("org/jetbrains/kotlin/idea/icons/field_variable.svg", -4943884320640938494L, 0);
-  /** 16x16 */ public static final @NotNull Icon InterfaceKotlin = load("org/jetbrains/kotlin/idea/icons/interfaceKotlin.svg", 6105411896669082060L, 1);
-  /** 16x16 */ public static final @NotNull Icon Kotlin = load("org/jetbrains/kotlin/idea/icons/kotlin.png", 0L, 1);
-  /** 13x13 */ public static final @NotNull Icon Kotlin13 = load("org/jetbrains/kotlin/idea/icons/kotlin13.png", 0L, 1);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_file = load("org/jetbrains/kotlin/idea/icons/kotlin_file.svg", 410462991849735236L, 0);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_gradle_script = load("org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.svg", 407924732847883692L, 0);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_js = load("org/jetbrains/kotlin/idea/icons/kotlin_js.svg", -4797950250597216272L, 0);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_launch_configuration = load("org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.svg", 8617317266006756955L, 0);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_multiplatform_project = load("org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.svg", 1800183257649593188L, 0);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_native = load("org/jetbrains/kotlin/idea/icons/kotlin_native.svg", 4139485729290770650L, 0);
-  /** 16x16 */ public static final @NotNull Icon Kotlin_script = load("org/jetbrains/kotlin/idea/icons/kotlin_script.svg", 8910176401343092076L, 0);
-  /** 16x16 */ public static final @NotNull Icon Lambda = load("org/jetbrains/kotlin/idea/icons/lambda.svg", -395028811269734745L, 0);
-  /** 16x16 */ public static final @NotNull Icon LoadScriptConfiguration = load("org/jetbrains/kotlin/idea/icons/loadScriptConfiguration.svg", 4218830826949357848L, 2);
-  /** 16x16 */ public static final @NotNull Icon ObjectKotlin = load("org/jetbrains/kotlin/idea/icons/objectKotlin.svg", 6837434796032324128L, 0);
-  /** 12x12 */ public static final @NotNull Icon SuspendCall = load("org/jetbrains/kotlin/idea/icons/suspendCall.svg", -6406590614097998571L, 2);
-  /** 16x16 */ public static final @NotNull Icon TypeAlias = load("org/jetbrains/kotlin/idea/icons/typeAlias.svg", -272854517691002937L, 0);
-  /** 16x16 */ public static final @NotNull Icon Value = load("org/jetbrains/kotlin/idea/icons/value.svg", 5883345383289852521L, 0);
-
-  public static final class Wizard {
-    /** 16x16 */ public static final @NotNull Icon Android = load("org/jetbrains/kotlin/idea/icons/wizard/android.svg", 7539975312323470635L, 0);
-    /** 16x16 */ public static final @NotNull Icon Compose = load("org/jetbrains/kotlin/idea/icons/wizard/compose.svg", 160562836348075998L, 0);
-    /** 16x16 */ public static final @NotNull Icon Console = load("org/jetbrains/kotlin/idea/icons/wizard/console.svg", -8378080712919798557L, 0);
-    /** 16x16 */ public static final @NotNull Icon Ios = load("org/jetbrains/kotlin/idea/icons/wizard/ios.svg", -6207668788895415586L, 0);
-    /** 16x16 */ public static final @NotNull Icon JS = load("org/jetbrains/kotlin/idea/icons/wizard/js.svg", -688693395373848289L, 0);
-    /** 16x16 */ public static final @NotNull Icon Jvm = load("org/jetbrains/kotlin/idea/icons/wizard/jvm.svg", 162781121887292258L, 0);
-    /** 16x16 */ public static final @NotNull Icon Linux = load("org/jetbrains/kotlin/idea/icons/wizard/linux.svg", 3866831033229145983L, 0);
-    /** 16x16 */ public static final @NotNull Icon MacOS = load("org/jetbrains/kotlin/idea/icons/wizard/macOS.svg", -3403600566714905943L, 0);
-    /** 16x16 */ public static final @NotNull Icon Multiplatform = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatform.svg", -6469017586665949204L, 0);
-    /** 16x16 */ public static final @NotNull Icon MultiplatformLibrary = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformLibrary.svg", -5968042525882549362L, 0);
-    /** 16x16 */ public static final @NotNull Icon MultiplatformMobile = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobile.svg", -8813901519156236976L, 0);
-    /** 16x16 */ public static final @NotNull Icon MultiplatformMobileLibrary = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobileLibrary.svg", -8434348402253626654L, 0);
-    /** 16x16 */ public static final @NotNull Icon Native = load("org/jetbrains/kotlin/idea/icons/wizard/native.svg", 6669135310113032649L, 0);
-    /** 16x16 */ public static final @NotNull Icon Nodejs = load("org/jetbrains/kotlin/idea/icons/wizard/nodejs.svg", -4106089222155620880L, 0);
-    /** 16x16 */ public static final @NotNull Icon PpWeb = load("org/jetbrains/kotlin/idea/icons/wizard/ppWeb.svg", -919003641439396121L, 0);
-    /** 16x16 */ public static final @NotNull Icon React = load("org/jetbrains/kotlin/idea/icons/wizard/react.svg", -6765773272068717159L, 0);
-    /** 16x16 */ public static final @NotNull Icon Windows = load("org/jetbrains/kotlin/idea/icons/wizard/windows.svg", 8510608514465228229L, 0);
-  }
-}

plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml

@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources-en" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

plugins/kotlin/frontend-independent/resources/icon-robots.txt

@@ -0,0 +1 @@
+skip: *

plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt

@@ -18,9 +18,8 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
+import org.jetbrains.kotlin.idea.KotlinIcons.*
 import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedIsKtLightClassForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.KotlinIconsIndependent.ACTUAL
-import org.jetbrains.kotlin.idea.KotlinIconsIndependent.EXPECT
 import org.jetbrains.kotlin.idea.util.ifTrue
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -55,12 +54,12 @@ open class KotlinIconProviderBase : IconProvider(), DumbAware {
         if (psiElement is KtFile) {
             if (psiElement.isScript()) {
                 return when {
-                    psiElement.name.endsWith(".gradle.kts") -> KotlinIconsIndependent.GRADLE_SCRIPT
-                    else -> KotlinIconsIndependent.SCRIPT
+                    psiElement.name.endsWith(".gradle.kts") -> GRADLE_SCRIPT
+                    else -> SCRIPT
                 }
             }
             val mainClass = getSingleClass(psiElement)
-            return if (mainClass != null) getIcon(mainClass, flags) else KotlinIconsIndependent.FILE
+            return if (mainClass != null) getIcon(mainClass, flags) else FILE
         }
 
         val result = psiElement.getBaseIcon()
@@ -120,39 +119,39 @@ open class KotlinIconProviderBase : IconProvider(), DumbAware {
 
         fun PsiElement.getBaseIcon(): Icon? = when (this) {
             is KtPackageDirective -> PlatformIcons.PACKAGE_ICON
-            is KtFile, is KtLightClassForFacade -> KotlinIconsIndependent.FILE
+            is KtFile, is KtLightClassForFacade -> FILE
             is KtLightClassForSourceDeclaration -> navigationElement.getBaseIcon()
             is KtNamedFunction -> when {
                 receiverTypeReference != null ->
-                    if (KtPsiUtil.isAbstract(this)) KotlinIconsIndependent.ABSTRACT_EXTENSION_FUNCTION else KotlinIconsIndependent.EXTENSION_FUNCTION
+                    if (KtPsiUtil.isAbstract(this)) ABSTRACT_EXTENSION_FUNCTION else EXTENSION_FUNCTION
                 getStrictParentOfType<KtNamedDeclaration>() is KtClass ->
                     if (KtPsiUtil.isAbstract(this)) PlatformIcons.ABSTRACT_METHOD_ICON else PlatformIcons.METHOD_ICON
                 else ->
-                    KotlinIconsIndependent.FUNCTION
+                    FUNCTION
             }
             is KtConstructor<*> -> PlatformIcons.METHOD_ICON
             is KtLightMethod -> when(val u = unwrapped) {
                 is KtProperty -> if (!u.hasBody()) PlatformIcons.ABSTRACT_METHOD_ICON else PlatformIcons.METHOD_ICON
                 else -> PlatformIcons.METHOD_ICON
             }
-            is KtFunctionLiteral -> KotlinIconsIndependent.LAMBDA
+            is KtFunctionLiteral -> LAMBDA
             is KtClass -> when {
-                isInterface() -> KotlinIconsIndependent.INTERFACE
-                isEnum() -> KotlinIconsIndependent.ENUM
-                isAnnotation() -> KotlinIconsIndependent.ANNOTATION
-                this is KtEnumEntry && getPrimaryConstructorParameterList() == null -> KotlinIconsIndependent.ENUM
-                else -> if (isAbstract()) KotlinIconsIndependent.ABSTRACT_CLASS else KotlinIconsIndependent.CLASS
+                isInterface() -> INTERFACE
+                isEnum() -> ENUM
+                isAnnotation() -> ANNOTATION
+                this is KtEnumEntry && getPrimaryConstructorParameterList() == null -> ENUM
+                else -> if (isAbstract()) ABSTRACT_CLASS else CLASS
             }
-            is KtObjectDeclaration -> KotlinIconsIndependent.OBJECT
+            is KtObjectDeclaration -> OBJECT
             is KtParameter -> {
                 if (KtPsiUtil.getClassIfParameterIsProperty(this) != null) {
-                    if (isMutable) KotlinIconsIndependent.FIELD_VAR else KotlinIconsIndependent.FIELD_VAL
+                    if (isMutable) FIELD_VAR else FIELD_VAL
                 } else
-                    KotlinIconsIndependent.PARAMETER
+                    PARAMETER
             }
-            is KtProperty -> if (isVar) KotlinIconsIndependent.FIELD_VAR else KotlinIconsIndependent.FIELD_VAL
-            is KtClassInitializer -> KotlinIconsIndependent.CLASS_INITIALIZER
-            is KtTypeAlias -> KotlinIconsIndependent.TYPE_ALIAS
+            is KtProperty -> if (isVar) FIELD_VAR else FIELD_VAL
+            is KtClassInitializer -> CLASS_INITIALIZER
+            is KtTypeAlias -> TYPE_ALIAS
             is KtAnnotationEntry -> {
                 (shortName?.asString() == JvmFileClassUtil.JVM_NAME_SHORT).ifTrue {
                     val grandParent = parent.parent
@@ -166,7 +165,7 @@ open class KotlinIconProviderBase : IconProvider(), DumbAware {
             is PsiClass -> providedIsKtLightClassForDecompiledDeclaration().ifTrue {
                 val origin = (this as? KtLightClass)?.kotlinOrigin
                 //TODO (light classes for decompiled files): correct presentation
-                if (origin != null) origin.getBaseIcon() else KotlinIconsIndependent.CLASS
+                if (origin != null) origin.getBaseIcon() else CLASS
             }
             else -> unwrapped?.takeIf { it != this }?.getBaseIcon()
         }

plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIcons.java

@@ -0,0 +1,77 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.ui.IconManager;
+import com.intellij.util.ImageLoader;
+import com.intellij.util.PlatformIcons;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+
+public interface KotlinIcons {
+    private static @NotNull Icon load(@NotNull String path, long cacheKey, int flags) {
+        return IconManager.getInstance().loadRasterizedIcon(path, KotlinIcons.class.getClassLoader(), cacheKey, flags);
+    }
+
+    private static @NotNull Icon load(@NotNull String path, long cacheKey) {
+        return load(path, cacheKey, ImageLoader.USE_CACHE);
+    }
+
+    /** 16x16 */ @NotNull Icon SMALL_LOGO = load("org/jetbrains/kotlin/idea/icons/kotlin.svg", -6159597857264791813L);
+    /** 13x13 */ @NotNull Icon SMALL_LOGO_13 = load("org/jetbrains/kotlin/idea/icons/kotlin13.svg", -5550034022007323579L);
+    /** 16x16 */ @NotNull Icon ABSTRACT_EXTENSION_FUNCTION = load("org/jetbrains/kotlin/idea/icons/abstract_extension_function.svg", 7417679411263450358L);
+    /** 16x16 */ @NotNull Icon ABSTRACT_CLASS = load("org/jetbrains/kotlin/idea/icons/abstractClassKotlin.svg", 6118422021574552028L);
+    /** 16x16 */ @NotNull Icon ACTUAL = load("org/jetbrains/kotlin/idea/icons/actual.svg", -4727863439746678606L);
+    /** 16x16 */ @NotNull Icon ANNOTATION = load("org/jetbrains/kotlin/idea/icons/annotationKotlin.svg", 1981410558175520747L);
+    /** 16x16 */ @NotNull Icon CLASS_INITIALIZER = load("org/jetbrains/kotlin/idea/icons/classInitializerKotlin.svg", 428407677003035493L);
+    /** 16x16 */ @NotNull Icon CLASS = load("org/jetbrains/kotlin/idea/icons/classKotlin.svg", -4723898843334724017L);
+    /** 12x12 */ @NotNull Icon DSL_MARKER_ANNOTATION = load("org/jetbrains/kotlin/idea/icons/dslMarkerAnnotation.svg", 5574692736776531477L);
+    /** 16x16 */ @NotNull Icon ENUM = load("org/jetbrains/kotlin/idea/icons/enumKotlin.svg", -8462447318313336813L);
+    /** 16x16 */ @NotNull Icon EXPECT = load("org/jetbrains/kotlin/idea/icons/expect.svg", -2910408808136595896L, ImageLoader.USE_CACHE | ImageLoader.ALLOW_FLOAT_SCALING);
+    Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON;
+    /** 16x16 */ @NotNull Icon FIELD_VAL = load("org/jetbrains/kotlin/idea/icons/field_value.svg", 173519203061099646L);
+    /** 16x16 */ @NotNull Icon FIELD_VAR = load("org/jetbrains/kotlin/idea/icons/field_variable.svg", -4943884320640938494L);
+    Icon FUNCTION = AllIcons.Nodes.Function;
+    /** 16x16 */ @NotNull Icon INTERFACE = load("org/jetbrains/kotlin/idea/icons/interfaceKotlin.svg", 6105411896669082060L, ImageLoader.USE_CACHE | ImageLoader.ALLOW_FLOAT_SCALING);
+    /** 16x16 */ @NotNull Icon FILE = load("org/jetbrains/kotlin/idea/icons/kotlin_file.svg", 410462991849735236L);
+    /** 16x16 */ @NotNull Icon GRADLE_SCRIPT = load("org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.svg", 407924732847883692L);
+    /** 16x16 */ @NotNull Icon JS = load("org/jetbrains/kotlin/idea/icons/kotlin_js.svg", -4797950250597216272L);
+    /** 16x16 */ @NotNull Icon LAUNCH = load("org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.svg", 8617317266006756955L);
+    /** 16x16 */ @NotNull Icon MPP = load("org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.svg", 1800183257649593188L);
+    /** 16x16 */ @NotNull Icon NATIVE = load("org/jetbrains/kotlin/idea/icons/kotlin_native.svg", 4139485729290770650L);
+    /** 16x16 */ @NotNull Icon SCRIPT = load("org/jetbrains/kotlin/idea/icons/kotlin_script.svg", 8910176401343092076L);
+    /** 16x16 */ @NotNull Icon LAMBDA = load("org/jetbrains/kotlin/idea/icons/lambda.svg", -395028811269734745L);
+    /** 16x16 */ @NotNull Icon LOAD_SCRIPT_CONFIGURATION = load("org/jetbrains/kotlin/idea/icons/loadScriptConfiguration.svg", 4218830826949357848L);
+    /** 16x16 */ @NotNull Icon OBJECT = load("org/jetbrains/kotlin/idea/icons/objectKotlin.svg", 6837434796032324128L);
+    Icon PARAMETER = PlatformIcons.PARAMETER_ICON;
+    /** 12x12 */ @NotNull Icon SUSPEND_CALL = load("org/jetbrains/kotlin/idea/icons/suspendCall.svg", -6406590614097998571L);
+    /** 16x16 */ @NotNull Icon TYPE_ALIAS = load("org/jetbrains/kotlin/idea/icons/typeAlias.svg", -272854517691002937L);
+    Icon VAR = PlatformIcons.VARIABLE_ICON;
+    /** 16x16 */ @NotNull Icon VAL = load("org/jetbrains/kotlin/idea/icons/value.svg", 5883345383289852521L);
+
+    final class Wizard {
+        /** 16x16 */ public static final @NotNull Icon ANDROID = load("org/jetbrains/kotlin/idea/icons/wizard/android.svg", 7539975312323470635L);
+        /** 16x16 */ public static final @NotNull Icon COMPOSE = load("org/jetbrains/kotlin/idea/icons/wizard/compose.svg", 160562836348075998L);
+        /** 16x16 */ public static final @NotNull Icon CONSOLE = load("org/jetbrains/kotlin/idea/icons/wizard/console.svg", -8378080712919798557L);
+        /** 16x16 */ public static final @NotNull Icon IOS = load("org/jetbrains/kotlin/idea/icons/wizard/ios.svg", -6207668788895415586L);
+        /** 16x16 */ public static final @NotNull Icon JS = load("org/jetbrains/kotlin/idea/icons/wizard/js.svg", -688693395373848289L);
+        /** 16x16 */ public static final @NotNull Icon JVM = load("org/jetbrains/kotlin/idea/icons/wizard/jvm.svg", 162781121887292258L);
+        /** 16x16 */ public static final @NotNull Icon LINUX = load("org/jetbrains/kotlin/idea/icons/wizard/linux.svg", 3866831033229145983L);
+        /** 16x16 */ public static final @NotNull Icon MAC_OS = load("org/jetbrains/kotlin/idea/icons/wizard/macOS.svg", -3403600566714905943L);
+        /** 16x16 */ public static final @NotNull Icon MULTIPLATFORM = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatform.svg", -6469017586665949204L);
+        /** 16x16 */ public static final @NotNull Icon MULTIPLATFORM_LIBRARY = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformLibrary.svg", -5968042525882549362L);
+        /** 16x16 */ public static final @NotNull Icon MULTIPLATFORM_MOBILE = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobile.svg", -8813901519156236976L);
+        /** 16x16 */ public static final @NotNull Icon MULTIPLATFORM_MOBILE_LIBRARY = load("org/jetbrains/kotlin/idea/icons/wizard/multiplatformMobileLibrary.svg", -8434348402253626654L);
+        /** 16x16 */ public static final @NotNull Icon NATIVE = load("org/jetbrains/kotlin/idea/icons/wizard/native.svg", 6669135310113032649L);
+        /** 16x16 */ public static final @NotNull Icon NODE_JS = load("org/jetbrains/kotlin/idea/icons/wizard/nodejs.svg", -4106089222155620880L);
+        /** 16x16 */ public static final @NotNull Icon WEB = load("org/jetbrains/kotlin/idea/icons/wizard/ppWeb.svg", -919003641439396121L);
+        /** 16x16 */ public static final @NotNull Icon REACT_JS = load("org/jetbrains/kotlin/idea/icons/wizard/react.svg", -6765773272068717159L);
+        /** 16x16 */ public static final @NotNull Icon WINDOWS = load("org/jetbrains/kotlin/idea/icons/wizard/windows.svg", 8510608514465228229L);
+    }
+
+
+
+
+}

plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconsIndependent.java

@@ -1,42 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.util.PlatformIcons;
-
-import javax.swing.*;
-
-public interface KotlinIconsIndependent {
-    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.svg");
-
-    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 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 = AllIcons.Nodes.Function;
-    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 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 ACTUAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/actual.svg");
-    Icon EXPECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/expect.svg");
-
-    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.svg");
-    Icon LOAD_SCRIPT_CONFIGURATION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/loadScriptConfiguration.svg");
-
-    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 NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg");
-}

plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/presentation/AnnotationPresenters.kt

@@ -7,7 +7,7 @@ import com.intellij.navigation.ItemPresentationProvider
 import com.intellij.psi.util.parentOfType
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.KotlinIconsIndependent
+import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.psi.*
 import javax.swing.Icon
 
@@ -43,5 +43,5 @@ class KtJvmNameAnnotatedFilePresentation(private val annotationEntry: KtAnnotati
         return KotlinBundle.message("presentation.text.in.container", containingFile.name, containingFile.packageFqName)
     }
 
-    override fun getIcon(unused: Boolean): Icon = KotlinIconsIndependent.FILE
+    override fun getIcon(unused: Boolean): Icon = KotlinIcons.FILE
 }

plugins/kotlin/jvm/resources/META-INF/jvm-common.xml

@@ -2,7 +2,7 @@
     <actions>
         <!-- Kotlin Console REPL-->
         <action id="KotlinConsoleREPL" class="org.jetbrains.kotlin.console.actions.RunKotlinConsoleAction"
-                icon="KotlinIdeaIcons.Kotlin_launch_configuration">
+                icon="org.jetbrains.kotlin.idea.KotlinIcons.LAUNCH">
             <add-to-group group-id="KotlinToolsGroup" anchor="last"/>
         </action>
 
@@ -32,7 +32,7 @@
 <!--            TODO(design)-->
             <action id="Kotlin.XDebugger.CoroutinesDump"
                 class="org.jetbrains.kotlin.idea.debugger.coroutine.command.CoroutineDumpAction"
-                    icon="KotlinIdeaIcons.Kotlin"/>
+                    icon="org.jetbrains.kotlin.idea.KotlinIcons.SMALL_LOGO"/>
         </group>
 
         <action id="Kotlin.XDebugger.ToggleKotlinVariableView"

plugins/kotlin/maven/resources/kotlin.maven.xml

@@ -109,15 +109,15 @@
       <separator />
 
       <action id="KotlinGenerateMavenCompileExecutionAction"
-              icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
+              icon="/org/jetbrains/kotlin/idea/icons/kotlin13.svg"
               class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenCompileExecutionAction"/>
 
       <action id="KotlinGenerateMavenTestCompileExecutionAction"
-              icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
+              icon="/org/jetbrains/kotlin/idea/icons/kotlin13.svg"
               class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenTestCompileExecutionAction"/>
 
       <action id="KotlinGenerateMavenPluginAction"
-              icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
+              icon="/org/jetbrains/kotlin/idea/icons/kotlin13.svg"
               class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenPluginAction"/>
 
       <add-to-group group-id="GenerateGroup" anchor="last" />

plugins/kotlin/plugin/resources/META-INF/core.xml

@@ -558,7 +558,7 @@
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
     </action>
 
-    <group id="KotlinToolsGroup" popup="true" icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
+    <group id="KotlinToolsGroup" popup="true" icon="/org/jetbrains/kotlin/idea/icons/kotlin13.svg"
            class="org.jetbrains.kotlin.idea.actions.KotlinActionGroup">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>