Compute scaled icon width from scaled icon height.

This commit has no visible effect, but prepares for improving the
calculation of the new icon width and height for icons that are not
32x32 pixels.
Improve icon scaling.

Always scale to height 16 pixels. This works better if the icon is not
32x32 pixels.