Code clean-up.
Add new icons.