rename icons to glyphs, fix watcher in cli