3efde1bfba
One computation was functionally equivalent to the new method, other places were not scaling icons at all. Fixes #13177.