More cleaning.. and trying to quickly add in a icon, isn't going well.