Service vector icons, performance tweaks