Compiled from dad42d0 - Toolbox buttons added.