refactor code for plist data inputs
update icons