diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java
index 16fe57bcea..bf19533034 100644
--- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java
+++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java
@@ -16,9 +16,10 @@
 package com.intellij.java.impl.internal.psiView;
 
 import consulo.annotation.component.ExtensionImpl;
-import consulo.ide.impl.idea.util.PlatformIcons;
 import consulo.language.psi.PsiElement;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.project.Project;
+import consulo.ui.ex.awtUnsafe.TargetAWT;
 
 import javax.swing.*;
 
@@ -28,15 +29,18 @@
  */
 @ExtensionImpl
 public class PsiViewerCodeFragmentExtension extends JavaPsiViewerExtension {
-  public String getName() {
-    return "Java Code Block";
-  }
+    @Override
+    public String getName() {
+        return "Java Code Block";
+    }
 
-  public Icon getIcon() {
-    return PlatformIcons.CLASS_INITIALIZER;
-  }
+    @Override
+    public Icon getIcon() {
+        return TargetAWT.to(PlatformIconGroup.nodesClassinitializer());
+    }
 
-  public PsiElement createElement(Project project, String text) {
-    return getFactory(project).createCodeBlockFromText(text, null);
-  }
+    @Override
+    public PsiElement createElement(Project project, String text) {
+        return getFactory(project).createCodeBlockFromText(text, null);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java
index db8befa5d1..c5fe781072 100644
--- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java
+++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java
@@ -16,9 +16,10 @@
 package com.intellij.java.impl.internal.psiView;
 
 import consulo.annotation.component.ExtensionImpl;
-import consulo.ide.impl.idea.util.PlatformIcons;
 import consulo.language.psi.PsiElement;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.project.Project;
+import consulo.ui.ex.awtUnsafe.TargetAWT;
 
 import javax.swing.*;
 
@@ -28,15 +29,18 @@
  */
 @ExtensionImpl
 public class PsiViewerExpressionExtension extends JavaPsiViewerExtension {
-  public String getName() {
-    return "Java Expression";
-  }
+    @Override
+    public String getName() {
+        return "Java Expression";
+    }
 
-  public Icon getIcon() {
-    return PlatformIcons.CLASS_INITIALIZER;
-  }
+    @Override
+    public Icon getIcon() {
+        return TargetAWT.to(PlatformIconGroup.nodesClassinitializer());
+    }
 
-  public PsiElement createElement(Project project, String text) {
-    return getFactory(project).createExpressionFromText(text, null);
-  }
+    @Override
+    public PsiElement createElement(Project project, String text) {
+        return getFactory(project).createExpressionFromText(text, null);
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java
index 986e0b5507..45e75cad91 100644
--- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java
+++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java
@@ -16,9 +16,10 @@
 package com.intellij.java.impl.internal.psiView;
 
 import consulo.annotation.component.ExtensionImpl;
-import consulo.ide.impl.idea.util.PlatformIcons;
 import consulo.language.psi.PsiElement;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.project.Project;
+import consulo.ui.ex.awtUnsafe.TargetAWT;
 
 import javax.swing.*;
 
@@ -28,15 +29,18 @@
  */
 @ExtensionImpl
 public class PsiViewerMethodExtension extends JavaPsiViewerExtension {
-  public String getName() {
-    return "Java Method";
-  }
+    @Override
+    public String getName() {
+        return "Java Method";
+    }
 
-  public Icon getIcon() {
-    return PlatformIcons.METHOD_ICON;
-  }
+    @Override
+    public Icon getIcon() {
+        return TargetAWT.to(PlatformIconGroup.nodesMethod());
+    }
 
-  public PsiElement createElement(Project project, String text) {
-    return getFactory(project).createMethodFromText(text, null);
-  }
+    @Override
+    public PsiElement createElement(Project project, String text) {
+        return getFactory(project).createMethodFromText(text, null);
+    }
 }