Fixed multiple icons issue