Added zoom button. Re #6761.
Merge branch 'feature/6761_zooming_on_pick_tab' into develop