Minor icon tweaking and cleanup.