Implemented icons.
Some tweaks...