Graphics Fixes

Resolved issues with icons conflicting.