Fixed multiple icon iissue
fixed another "force close" bug