General Icon Iprovements