some fixes
Icon added, some fixes