added icons, removed legacy dependencies