I don't think this PR ought to modify this file at all.  

Note that there are merge conflict problems with the changes that are here.  You still have the old battery-10 icon.  And you now have two copies of icon-camera-back:before, and probably others.