Revert "AdditionalViewControl custom image hint improvements"

This reverts commit 42d20f498e37a3a66c3c192c5123dda4896b5eca.
Merge branch 'master' of https://github.com/StephenManderson/eXpand