Improved FactionIcon.
Cleanup.