add camera icon
fix merge conflicts