fixed multiple redraw of refresh icon and crash issue
Merge remote-tracking branch 'origin/master'