Bugfixes + new icon