Fix icon path, prepare support for Elvin uploader
Support for Elvin uploader (sooo simple, sooo awesome)