Avoid expensive scaling of images that we will not use, don't hard-code
the toolbar size - but query it instead from the toolbar/theme, unwind
various other tangles: still quite some cleanup left here including HC
handling.

Change-Id: Ia2a1a0f91e5910c2de01f11229b32ed71dd8cf28