Removing unused icons and fixing #219
Fixes #204
Fixes #238