New and updated icons
Change to new icons
Remove unused icons, a few spacing tweaks