Improve loading performance of drawing
Change navbar icon