diff --git a/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java b/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
index e6b780129a25..d995c805c8b3 100644
--- a/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
+++ b/platform/lang-api/src/com/intellij/psi/impl/ElementBase.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.UserDataHolderBase;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.IndexNotReadyException;
@@ -95,7 +96,7 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
   }
 
   protected boolean isToDeferIconLoading() {
-    return true;
+    return Registry.is("psi.deferIconLoading");
   }
 
   private Icon computeIconNow(PsiElement element, int flags) {
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 7671ea69a6c3..ca1ebbe79aa2 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -77,7 +77,10 @@ compiler.perform.outputs.refresh.on.start.description=Whether to perform initial
 compiler.perform.outputs.refresh.on.start.restartRequired=false
 vcs.show.colored.annotations=true
 vcs.showConsole=true
+
 psi.viewer.selection.color=0,153,153
+psi.deferIconLoading=true
 
 structureView.coalesceTime=500
 jar.build=false
+