Port bf4a7c84ec1f8c57b1cc74dacf5d17aefcf2e116 to master

This moves test icons checking functionality to a admin check
and is backported from work completed and previously in reviewed in github
from the next branch in 2011.