Refactor svg

:+1: