Bug Fixes for displaying certain icons.