am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf

* commit '89ee93e0f8b6ac1ed6aefc2b940d1606f2027491':
  Use the icon bounds for all calculations.