new icons, reorganized stuff