fixup upload, add icons, cleanup a bit

removed all the images images confusion
using file tokens for classes, implemented better extension tokens,
normalized i18n