Fixed a lot of bugs in icons, something more