Icon issues

Addresses #38