Move tray icon to separate package, remove a few relative imports