Nice job.
Have a
look at my changes to make the toolbar configurable in a generic way. In that way you do not have to change popupmenu for every application.
I used it in xournal,
see this changeset (although there are more things changed with the changeset).