Code cleanup
Also render the icon theme inline in standalone mode