Fix for non-OSX platforms
Merge branch 'refactor-syntax_unicode_button_menu' into refactor-syntax_unicode_kupdown