diff --git a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
index 3b165023b1df..1a2abe8b1219 100644
--- a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
+++ b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
@@ -16,8 +16,10 @@
 package com.intellij.ide.diff;
 
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Icons;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
 import java.io.IOException;
 
 /**
@@ -80,4 +82,9 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
   public VirtualFile getValue() {
     return myFile;
   }
+
+  @Override
+  public Icon getIcon() {
+    return isContainer() ? Icons.FOLDER_ICON : myFile.getIcon();
+  }
 }