Tweaked, with icons.