Updated Icons -sam
more fixes
Merge remote-tracking branch 'origin/working'