Implement basic support for the new icon cache layout
Fix wrong DATADIR variable