replaced deprecated functions, added icon