Added support of paths with spaces
added icon