Added IconServlet and test.
Aaargh. Just some minor cleanup.