Revert "Start service on boot, new icon"

This reverts commit d108159db7722052483ee8b2b0b92095aade5f7b.
cleanup etc
Add new icons