BugFix and changed icons