Fixed a lot of bugs with the icons.