Add icon.
Many tweaks.