added icon and bundle name
using APP_NAME wherever possible, cleanup