Moved watcher type to Ui
Moved icon_cache to its own file