diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
index 5e2b9dd4da..5ecf7aa4fc 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
@@ -23,21 +23,27 @@ import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
 
 /**
- * This class is used to represent the "Node" for the directory.
- * Its children are more directories. 
+ * This class is used to represent the "Node" for the directory. Its children
+ * are more directories.
  */
 public class DirectoryNode extends AbstractFsContentNode<Directory> {
-    
+
     public static final String DOTDOTDIR = "[parent folder]";
     public static final String DOTDIR = "[current folder]";
-    
+
     public DirectoryNode(Directory dir) {
         this(dir, true);
+
+        setIcon(dir);
     }
 
     public DirectoryNode(Directory dir, boolean directoryBrowseMode) {
         super(dir, directoryBrowseMode);
 
+        setIcon(dir);
+    }
+
+    private void setIcon(Directory dir) {
         // set name, display name, and icon
         if (dir.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.UNALLOC)) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
@@ -66,12 +72,9 @@ public class DirectoryNode extends AbstractFsContentNode<Directory> {
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
     }
-    
-        @Override
+
+    @Override
     public TYPE getDisplayableItemNodeType() {
         return TYPE.CONTENT;
     }
-    
-    
-
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
index c67965b68c..8486998c2d 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
@@ -33,11 +33,19 @@ public class FileNode extends AbstractFsContentNode<File> {
      */
     public FileNode(File file) {
         this(file, true);
+
+        setIcon(file);
+
+
     }
 
     public FileNode(File file, boolean directoryBrowseMode) {
         super(file, directoryBrowseMode);
 
+        setIcon(file);
+    }
+
+    private void setIcon(File file) {
         // set name, display name, and icon
         if (file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.UNALLOC)) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/file-icon-deleted.png");
@@ -58,12 +66,12 @@ public class FileNode extends AbstractFsContentNode<File> {
     }
 
     @Override
-    public <T> T accept(ContentNodeVisitor<T> v) {
+    public <T> T accept(ContentNodeVisitor< T> v) {
         return v.visit(this);
     }
 
     @Override
-    public <T> T accept(DisplayableItemNodeVisitor<T> v) {
+    public <T> T accept(DisplayableItemNodeVisitor< T> v) {
         return v.visit(this);
     }
 
@@ -140,6 +148,4 @@ public class FileNode extends AbstractFsContentNode<File> {
     public boolean isLeafTypeNode() {
         return true;
     }
-    
-    
 }