zoom icons in
Merge remote-tracking branch 'upstream/master'
Merge pull request #112 from jpecht/master

zoom icons addition