more hackery - needs to be cleaned up
added icon