Fixes: #2932 getting rid of last bad icon paths around