Couple of fixes (compilation error on non-OSX, string length bug on OSX)
Revert accidental changes to icons
Fix dangling "else" statements
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_kupdown
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode_kupdown
Input problem on Linux (broke when non-printing key was pressed)
Merge branch 'refactor-syntax_unicode_kupdown' into refactor-syntax_unicode_fieldtext