Merge "Fixed that an icon could become invisible"