Modified icons.
Other minor bugs fixed.