diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 1a804bf6b0..9c1c765006 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -33,6 +33,7 @@ import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.DerivedFile;
 import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;
+import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.LayoutFile;
 import org.sleuthkit.datamodel.ReadContentInputStream;
 import org.sleuthkit.datamodel.TskException;
@@ -102,7 +103,14 @@ public final class ContentUtils {
 
     public static TimeZone getTimeZone(Content c) {
         try {
-            return TimeZone.getTimeZone(c.getImage().getTimeZone());
+            final Image image = c.getImage();
+            if (image != null) {
+                return TimeZone.getTimeZone(image.getTimeZone());
+            }
+            else {
+                //case such as top level VirtualDirectory
+                return TimeZone.getDefault();
+            }
         } catch (TskException ex) {
             return TimeZone.getDefault();
         }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index 9c286077d0..b9badf85be 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -43,7 +43,23 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
         super(ld);
 
         this.setDisplayName(nameForLayoutFile(ld));
-        this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
+        
+        String name = ld.getName();
+        
+        //set icon for name, special case for some built-ins
+        if (name.equals(VirtualDirectory.NAME_UNALLOC)) {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
+        }
+        else if (name.equals(VirtualDirectory.NAME_LOCAL)) {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-local-icon-16.png");
+        }
+        else if (name.equals(VirtualDirectory.NAME_CARVED)) {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png"); //TODO
+        }
+        else {
+            this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png");
+        }
+        
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png
new file mode 100644
index 0000000000..0395815b73
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png differ