diff --git a/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt b/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt
index 21142fff582f..2b1f7af4d9c0 100644
--- a/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt
+++ b/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt
@@ -40,7 +40,7 @@ import javax.swing.Icon
 class CoreIconManager : IconManager, CoreAwareIconManager {
   override fun getPlatformIcon(id: PlatformIcons): Icon {
     return when (id) {
-      PlatformIcons.Public -> AllIcons.Nodes.Public
+      PlatformIcons.Public -> AllIcons.Nodes.C_public
       PlatformIcons.Private -> AllIcons.Nodes.C_private
       PlatformIcons.Protected -> AllIcons.Nodes.C_protected
       PlatformIcons.Local -> AllIcons.Nodes.C_plocal
diff --git a/plugins/kotlin/base/util/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt b/plugins/kotlin/base/util/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
index bdc6b94095f9..c9875a6d3caf 100644
--- a/plugins/kotlin/base/util/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
+++ b/plugins/kotlin/base/util/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
@@ -123,7 +123,7 @@ abstract class KotlinIconProvider : IconProvider(), DumbAware {
                 null
             }
 
-            return icon?.let(IconManager.getInstance()::getPlatformIcon) ?: PlatformIcons.PUBLIC_ICON
+            return (icon ?: com.intellij.ui.PlatformIcons.Public).let(IconManager.getInstance()::getPlatformIcon)
         }
 
         private fun PsiFile.scriptIcon(): Icon = when {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinIconProviderTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinIconProviderTest.kt
index ee17058d5ace..75ecd41d6547 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinIconProviderTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinIconProviderTest.kt
@@ -11,7 +11,7 @@ import javax.swing.Icon
 
 class KotlinIconProviderTest: KotlinLightCodeInsightFixtureTestCase() {
     fun testPublicClassFile() {
-        createFileAndCheckIcon("Foo.kt", "class Foo", "org/jetbrains/kotlin/idea/icons/classKotlin.svg", "nodes/c_public.svg")
+        createFileAndCheckIcon("Foo.kt", "class Foo", "org/jetbrains/kotlin/idea/icons/classKotlin.svg", "Public")
     }
 
     fun testFileSingleFunction() {
@@ -23,7 +23,7 @@ class KotlinIconProviderTest: KotlinLightCodeInsightFixtureTestCase() {
             typealias F = Foo
             class Foo
         """.trimIndent()
-        createFileAndCheckIcon("Foo.kt", fileBody, "org/jetbrains/kotlin/idea/icons/classKotlin.svg", "nodes/c_public.svg")
+        createFileAndCheckIcon("Foo.kt", fileBody, "org/jetbrains/kotlin/idea/icons/classKotlin.svg", "Public")
     }
 
     fun testClassAndPrivateFunction() {
@@ -31,7 +31,7 @@ class KotlinIconProviderTest: KotlinLightCodeInsightFixtureTestCase() {
             class Foo
             private fun bar() {}
         """.trimIndent()
-        createFileAndCheckIcon("Foo.kt", fileBody, "org/jetbrains/kotlin/idea/icons/classKotlin.svg", "nodes/c_public.svg")
+        createFileAndCheckIcon("Foo.kt", fileBody, "org/jetbrains/kotlin/idea/icons/classKotlin.svg", "Public")
     }
 
     fun testClassAndInternalFunction() {