Refactor service icons so they're pluggable even, add in support for container icons, rework layout on container list
Meant to set the container icon height appropriately, as well as for image icons