Done with icons.
Further changes.