Merge "Minor cleanup in restricted_icon." into nyc-dev