svg symbols, some refactoring and redesigning