Tweaks and removing SVG icons