fix bug where 'Cancel' button creates icon and text toolbar regardless of prefs