Tab icons
Merge branch 'conclarke-master'