implement new icon
flatten out icons
ui improvements