Refactored to new FileSystem and add icon