Fixed: Arrangement of iconset tab buttons
Merge remote-tracking branch 'origin/master' into gh-pages