comment out icons.  Attempt to make files like other branches.  had merge conflict, was easier to fix by hand.