Reviewed reworked SVG icons and use old icons for some cases