This is a follow up for #211 .

The current icons used are pretty lame, do better next time. :D

Since I don't know when I will have time to tackled this down, I'm not setting up a Milestone for this one.

But it probably should be carried on on the same milestone as #212 .