map ui/ui to toolbar.
Merge branch 'toolbar-fixes-20130814' into testing