wip: use toolbar with picker

Change-Id: Id3d7d1ef04bc728b25ecae8d08527676c33bb2e7