Indentation fix + FolderIcon feature

Folder can now be represented by an icon