Fix missing groupchat icon, clean up some code