Added jam jar icon and other stuff
Fixed merge conflict