bug fixes and removing of duplicate icons and shortcuts