Bug Fixes + new icon