Fix #3326 - highlight drawing problems

Fixes #3326 

This fixes two highlight drawing problems:

* Empty items should not be highlighted
* Highlight size is incorrect when element has padding or border