Merge "Allow user to get his own icon." into nyc-dev