names refactored/icon changed (icon will need to be changed again)