Cleaner image selection
correct svg classes