Some cleanup + marginally nicer icon rollover