Some more SVG icons updated and some cosmetic code changes.