Improved FactionIcon and cleanup.