cleanup, icons and sabitest-map