Merge pull request #496 from Foggalong/master

Updating some old icons from square to circle
Bahama mama. Minor fixes to Joshua's icons.
GTG, Samba, AWF icons
Merge pull request #497 from cldx/master

GTG, Samba, AWF icons
Numix'd lock badge icon