We used to tint the injected pref icon when refreshing Tile. However, when we are going to render the icon, we used Tile.getIcon which uses the icon resource id to get the original version of icon directly. Do a little refactor here to move the tinting logic inside Tile.getIcon. Test: Manual/Visual inspection Fixes: 129010399 Change-Id: I6f187b12cb6d91b54dcfe43e0ff34add55fd7b07