Add blank icon option
Merge branch 'johnfraney-master'