diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
index a610a94b2f39..cfa4c401d2ce 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
@@ -225,7 +225,7 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
   @Override
   public Icon getIconFor(IntentionActionWithTextCaching value) {
     Icon icon = getOriginalIconFor(value);
-    if (icon == null) {
+    if (icon == null || icon instanceof EmptyIcon) {
       icon = EmptyIcon.create(myMaxIconSize.width, myMaxIconSize.height);
     }
     return icon;
@@ -281,7 +281,7 @@ public class IntentionListStep implements ListPopupStep<IntentionActionWithTextC
     for (IntentionActionWithTextCaching action : myCachedIntentions.getAllActions()) {
       if (!action.isShowIcon()) continue;
       Icon icon = myCachedIntentions.getIcon(action);
-      if (icon == null) continue;
+      if (icon == null || icon instanceof EmptyIcon) continue;
       maxWidth = Math.max(maxWidth, icon.getIconWidth());
       maxHeight = Math.max(maxHeight, icon.getIconHeight());
     }