Fixed thumbnail generation, added general file icon, fixed merge problems