Denoised the indicator textures, small code clean ups