Changing resources to use icon && fixing test which was needlessly dependent on SQL ordering