fix icin overlays for Mac (not available)
merge desktop changes