Updated icons.
Test cleanup.
Updated icons.