Icon position updates

Andy, Thanks for the 2.1 update - excellent.
I have applied a few of the icon position updates into this Pull if you wish to include in the master. I will update more as I use the various icons and will provide updates.