switched out icons
correct icons, moved donut down, fixed wrapping hopefully
Merge branch 'julia' into testing