fixed bug, added icons