Restructure legend icons, addresses 1 and 3 of #87
Merge branch 'master' of https://github.com/zrho/afp