Fixed stack overflow crash when using goto loop;
Fixed toolbar icon not changing when using hotkeys.