Few bugfixes and added all the icons needed