Merge topic 'fix-overlay-icon-windows'

12ef832c96 cmake-gui: Fix icon overlay on windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3217