Alpha 4 - Fix Template Images with the toolbar.