Merge "Fixed an issue where a shelf icon could be white"