new icons, tweaked layout