Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage
am: fc956e5a2a

* commit 'fc956e5a2a818c06ed3424e15b0aa20a3f604658':
  Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage