Fixes #200

Still needing a few icons not in the issue