Fix double icon problem