Fixes #83,#107.  Also Fixes #106 although these icons were just removed for consistency with the rest of the tool