Fixed double icon bug - joe