removed unneeded icons, finished changes in Evernote list for PSet, added in 3 changes with list that were removed in merge