Fixed icon paths. Cleaned code