Fixing up some icons
Some code reduction, more icons