#829: Updated layout of icons
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing