Move test icons functionality to an admin check

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.