Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage"
am: 261194387b

* commit '261194387beebaa7927ec4e310274218b651494d':
  Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage"