Upgrade Icons

Adding icons for Font Awesome 4.2 as well as some new Canvas icons
Output Buffer Fix
merged with upstream