Merged latest fixes to the toolbar.
Merged with latest changes by @bummytime.
Recreated the pod project after my merge.