Floating Window: Update with last changes by PA for Hover too