The Material picker shouldn't change icon based on it's state, it should always display the Material icon.