Fix icon flickering