Cleanup and new icon thanx to Interloper