Use more icons, update styling
Change popup icons