Add icons for discovery and launcher + finish replacing discovery button